Merge branch 'master' of http://148.66.10.10:3000/kk/game

game-business/src/main/java/com/game/business/domain/AppUser.java

@@ -131,12 +131,18 @@ private static final long serialVersionUID=1L;
     @TableField(value = "city_edit")
     private Long cityEdit;
 
-    /** 金币 /充值金额 */
-    @ApiModelProperty(value = "金币 /充值金额")
-    @Excel(name = "金币 /充值金额")
+    /** 金币 */
+    @ApiModelProperty(value = "金币")
+    @Excel(name = "金币")
     @TableField(value = "coin")
     private Double coin;
 
+    /** 金币 */
+    @ApiModelProperty(value = "可兑换（提现）金币")
+    @Excel(name = "可兑换（提现）金币")
+    @TableField(value = "coin_cash")
+    private Double coinCash;
+
     /** 星座 */
     @ApiModelProperty(value = "星座")
     @Excel(name = "星座")
@@ -935,8 +941,8 @@ private static final long serialVersionUID=1L;
     private String fundPassword;
 
     /** 余额/可提现余额 */
-    @ApiModelProperty(value = "余额/可提现余额")
-    @Excel(name = "余额/可提现余额")
+    @ApiModelProperty(value = "余额")
+    @Excel(name = "余额")
     @TableField(value = "diamond_coin")
     private Double diamondCoin;
 
@@ -946,6 +952,12 @@ private static final long serialVersionUID=1L;
     @TableField(value = "diamond_coin_total")
     private Double diamondCoinTotal;
 
+    /** 累计余额总数 */
+    @ApiModelProperty(value = "可提现余额")
+    @Excel(name = "可提现余额")
+    @TableField(value = "diamond_coin_cash")
+    private Double diamondCoinCash;
+
     /** 累计提现余额 */
     @ApiModelProperty(value = "累计提现余额")
     @Excel(name = "累计提现余额")

game-business/src/main/java/com/game/business/domain/AppUserCountDividend.java

@@ -87,7 +87,7 @@ private static final long serialVersionUID=1L;
     @ApiModelProperty(value = "状态 0：未发放  1：已发放")
     @Excel(name = "状态 0：未发放  1：已发放")
     @TableField(value = "status")
-    private Long status;
+    private Integer status;
 
     /** 创建时间 */
     @ApiModelProperty(value = "创建时间")

game-business/src/main/java/com/game/business/service/impl/AppUserCountDividendServiceImpl.java

@@ -188,7 +188,10 @@ public class AppUserCountDividendServiceImpl extends ServiceImpl<AppUserCountDiv
                         finTranRecordService.insertFinTranRecord(t);
                     });
                 }
-                updateAppUser.setDiamondCoin(e.getDiamondCoin());
+                AppUserCountDividend userCountDividend = new AppUserCountDividend();
+                userCountDividend.setId(e.getId());
+                userCountDividend.setStatus(1);
+                this.updateAppUserCountDividend(userCountDividend);
             });
         }
         return HttpRet.success("发放成功",true);