Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccInfoDetailsVO.java

@@ -30,6 +30,8 @@ public class AccInfoDetailsVO {
    @ApiModelProperty("用户部门")
    private String deptName;
    @ApiModelProperty("用户部门")
+   private String deptFullName;
+   @ApiModelProperty("用户部门")
    private Long deptId;
    @ApiModelProperty("用户类别(展示)")
    @Excel(name = "用户类别(展示)")

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/AccReportController.java

@@ -41,11 +41,11 @@ public class AccReportController extends BaseController
         return getDataTable(list);
     }
 
-    @ApiOperation("查询账户余额统计")
+//    @ApiOperation("账户余额汇总")
-    @PostMapping({"/balance/sum"})
+//    @PostMapping({"/balance/sum"})
-    public AjaxResult queryAccInfoBalanceSum(@RequestBody AccountInfoQueryParam accountInfoQueryParam) {
+//    public AjaxResult queryAccInfoBalanceSum(@RequestBody AccountInfoQueryParam accountInfoQueryParam) {
-        return AjaxResult.success(this.accReportService.balanceListSum(accountInfoQueryParam));
+//        return AjaxResult.success(this.accReportService.balanceListSum(accountInfoQueryParam));
-    }
+//    }
     @ApiOperation("充值方式汇总")
     @PostMapping("/recharge")
     @ResponseBody

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordVO.java

@@ -15,6 +15,7 @@ public class RechargeRecordVO implements Serializable {
     @JsonIgnore
     private Long subNum;
     private BigDecimal cashRechargeAmount;
+    @JsonIgnore
     private BigDecimal aliRechargeAmount;
     private BigDecimal subRechargeAmount;
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/TradeFlowVO.java

@@ -14,6 +14,7 @@ public class TradeFlowVO implements Serializable {
     private String phonenumber;
     private Long deptId;
     private String deptName;
+    private String deptFullName;
     private BigDecimal accAllBal;
     private LocalDateTime tradeTime;
     private Integer tradeType;

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordVO.java

@@ -12,6 +12,7 @@ public class WithdrawRecordVO implements Serializable {
     private String nickName;
     private Long deptId;
     private String deptName;
+    private String deptFullName;
     private int withdrawNum;
     private double withdrawAmount;
 }

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml

@@ -387,6 +387,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         t2.nick_name,
         t2.phonenumber as phoneNumber,
         t6.dept_name,
+        t6.dept_full_name,
         t2.user_type as userType,
         t1.scope,
         t1.acc_status,

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             su.nick_name,
             sd.dept_id,
             sd.dept_name,
+            sd.dept_full_name,
             count(1) AS withdraw_num,
             SUM(IFNULL( atwd.amount, 0)) AS withdraw_amount
         from acc_trade_wallet_detail atwd

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         su.phonenumber,
         sd.dept_id,
         sd.dept_name,
+        sd.dept_full_name,
         at2.acc_all_bal,
         at2.trade_time,
         at2.trade_type,