Merge remote-tracking branch 'origin/package' into package

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/RoleRechargeRankingDTO.java

@@ -124,9 +124,9 @@ public class RoleRechargeRankingDTO extends BasePage {
     private String phone;
 
     /**
-     * 客服手机绑定状态
+     * 客户手机绑定状态
      */
-    @ApiModelProperty(value = "客服手机绑定状态 0未绑定 1绑定")
+    @ApiModelProperty(value = "客户手机绑定状态 0未绑定 1绑定")
     private Integer userPhoneStatus;
 
     /**

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/AdsOrderDetailServiceImpl.java

@@ -503,6 +503,7 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
                          back_money,
                          'tencent_mini' as back_table_name
                        FROM dm_ad_tencent.t_game_tencent_mini_game_order
+                       where back_type = 'BACK_API'
                          UNION ALL
                        SELECT id,
                          order_id,
@@ -584,7 +585,7 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
                              SELECT
                                     order_no as order_id,
                                     any_value(back_count)
-                         FROM dm_ad_tencent.t_game_tencent_mini_game_order_split_log group by order_no
+                         FROM dm_ad_tencent.t_game_tencent_mini_game_order_split_log where back_type = 'BACK_API' group by order_no
                         union all
                              SELECT
                                     order_no as order_id,
@@ -729,6 +730,7 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
                 			back_money,
                 			'tencent_mini' as back_table_name
                 		FROM dm_ad_tencent.t_game_tencent_mini_game_order
+                		where back_type = 'BACK_API'
                 		UNION ALL
                 		SELECT
                 			id,

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/RoleAssignRecordServiceImpl.java

@@ -98,6 +98,7 @@ public class RoleAssignRecordServiceImpl extends ServiceImpl<RoleAssignRecordMap
     public boolean configSysUser(RoleSysUserAssignParam param) {
         Long sysUserId = SecurityUtil.getUserId();
         LocalDateTime now = LocalDateTime.now();
+        boolean singleConfig = param.getRoleInfoAndAgentParamList().size() == 1;
         List<RoleAssignRecord> lastAssignRecordList = new ArrayList<>();
         List<RoleAssignRecord> insertAssignRecordList = new ArrayList<>();
         param.getRoleInfoAndAgentParamList().forEach(item -> {
@@ -127,7 +128,7 @@ public class RoleAssignRecordServiceImpl extends ServiceImpl<RoleAssignRecordMap
                 //存在记录，更新最后一条记录
                 int compare = param.getStartTime().compareTo(lastAssignRecord.getStartTime());
                 if (compare < 0) {
-                    throw new BaseException("角色" + item.getRoleId() + "开始时间不能早于上条指派记录的开始时间！！！");
+                    throw new BaseException("角色id:" + item.getRoleId() + ",开始时间不能早于上条指派记录的开始时间！！！");
                 }
                 lastAssignRecord.setUpdateBy(sysUserId);
                 lastAssignRecord.setUpdateTime(now);
@@ -139,10 +140,10 @@ public class RoleAssignRecordServiceImpl extends ServiceImpl<RoleAssignRecordMap
                     lastAssignRecord.setIsOperUpdate(previousAssignRecord == null ? Boolean.TRUE : param.getOperUserId() != null && !Objects.equals(param.getOperUserId(), previousAssignRecord.getOperUserId()));
                     lastAssignRecord.setIsCustomerUpdate(previousAssignRecord == null ? Boolean.TRUE : param.getCustomerServiceId() != null && !Objects.equals(param.getCustomerServiceId(), previousAssignRecord.getCustomerServiceId()));
                     //参数变更
-                    lastAssignRecord.setGsId(param.getGsId());
-                    lastAssignRecord.setOperUserId(param.getOperUserId());
-                    lastAssignRecord.setCustomerServiceId(param.getCustomerServiceId());
-                    lastAssignRecord.setRemark(param.getRemark());
+                    lastAssignRecord.setGsId(singleConfig ? param.getGsId() : null != param.getGsId() ? param.getGsId() : lastAssignRecord.getGsId());
+                    lastAssignRecord.setOperUserId(singleConfig ? param.getOperUserId() : null != param.getOperUserId() ? param.getOperUserId() : lastAssignRecord.getOperUserId());
+                    lastAssignRecord.setCustomerServiceId(singleConfig ? param.getCustomerServiceId() : null != param.getCustomerServiceId() ? param.getCustomerServiceId() : lastAssignRecord.getCustomerServiceId());
+                    lastAssignRecord.setRemark(singleConfig ? param.getRemark() : null != param.getRemark() ? param.getRemark() : lastAssignRecord.getRemark());
                 } else {
                     lastAssignRecord.setEndTime(param.getStartTime());
                     insertAssignRecordList.add(insertRoleAssignRecord);