Merge remote-tracking branch 'origin/v11.1_plat_acc_config_20240125' into…

performance-api/src/main/java/com/clx/performance/param/pc/carrier/SavePlatformAccountConfigParam.java

@@ -4,33 +4,58 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
 public class SavePlatformAccountConfigParam {
 
     @ApiModelProperty(value = "id")
     private Integer Id;
+
+    @NotNull(message = "应用场景不能为空")
     @ApiModelProperty(value = "应用场景 1-结算单，2-违约结算单，3-充值，4-提现")
     private Integer businessType;
+
+    @NotNull(message = "货主类型不能为空")
     @ApiModelProperty(value = "货主类型 1-企业，2-个人")
     private Integer ownerType;
+
+    @NotNull(message = "开票标识不能为空")
     @ApiModelProperty(value = "开票标识：1网运单 2普通单")
     private Integer invoiceType;
+
+    @NotNull(message = "开票公司id不能为空")
     @ApiModelProperty(value = "开票公司id")
     private Integer invoiceCompanyId;
+
+    @NotBlank(message = "开票公司名称不能为空")
     @ApiModelProperty(value = "开票公司名称")
     private String invoiceCompanyName;
+
+    @NotNull(message = "配置范围不能为空")
     @ApiModelProperty(value = "配置范围：1收款账户 2付款账户")
     private Integer configRange;
 
+
+    @NotBlank(message = "公司名称不能为空")
     @ApiModelProperty(value = "公司名称")
     private String companyName;
+
+    @NotBlank(message = "银行名称不能为空")
     @ApiModelProperty(value = "银行名称")
     private String bankName;
+
+    @NotBlank(message = "开户行不能为空")
     @ApiModelProperty(value = "开户行")
     private String openBank;
+
+    @NotBlank(message = "银行编码不能为空")
     @ApiModelProperty(value = "银行编码")
     private String bankCode;
+
+    @NotBlank(message = "银行账号不能为空")
     @ApiModelProperty(value = "银行账号")
     private String bankCardNo;
 

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPagePlatformAccountConfigVO.java

@@ -48,6 +48,15 @@ public class CarrierPagePlatformAccountConfigVO {
     @ApiModelProperty(value = "银行账号")
     private String bankCardNo;
 
+    @ApiModelProperty(value = "创建人编码")
+    private Long createUserNo;
+    @ApiModelProperty(value = "创建人姓名")
+    private String createUserName;
+    @ApiModelProperty(value = "修改人编码")
+    private Long modifiedUserNo;
+    @ApiModelProperty(value = "修改人姓名")
+    private String modifiedUserName;
+
     @ApiModelProperty(value = "删除状态: 0-否;1-是")
     private Integer deleteStatus;
     @ApiModelProperty(value = "创建时间")

performance-web/src/main/java/com/clx/performance/model/PlatformAccountConfig.java

@@ -39,6 +39,11 @@ public class PlatformAccountConfig implements HasKey<Integer> {
     private String bankCode;              //银行编码
     private String bankCardNo;            //银行账号
 
+    private Long createUserNo;            //创建人编码
+    private String createUserName;        //创建人姓名
+    private Long modifiedUserNo;          //修改人编码
+    private String modifiedUserName;      //修改人姓名
+
     private Integer deleteStatus;         //删除状态: 0-否;1-是
     private LocalDateTime createTime;     //创建时间
     private LocalDateTime modifiedTime;   //修改时间

performance-web/src/main/java/com/clx/performance/service/impl/PlatformAccountConfigServiceImpl.java

@@ -12,6 +12,8 @@ import com.clx.performance.service.PlatformAccountConfigService;
 import com.clx.performance.struct.PlatformAccountConfigStruct;
 import com.clx.performance.vo.pc.carrier.settle.*;
 import com.msl.common.exception.ServiceSystemException;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -57,6 +59,8 @@ public class PlatformAccountConfigServiceImpl implements PlatformAccountConfigSe
     @Override
     public void updatePlatformAccountConfig(SavePlatformAccountConfigParam param) {
 
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        
         PlatformAccountConfig config = new PlatformAccountConfig();
         config.setId(param.getId());
         config.setBusinessType(param.getBusinessType());
@@ -70,6 +74,8 @@ public class PlatformAccountConfigServiceImpl implements PlatformAccountConfigSe
         config.setOpenBank(param.getOpenBank());
         config.setBankCode(param.getBankCode());
         config.setBankCardNo(param.getBankCardNo());
+        config.setModifiedUserNo(loginUserInfo.getUserNo());
+        config.setModifiedUserName(loginUserInfo.getShadowUserName());
         if(!checkConfigOnly(config)){
             throw new ServiceSystemException(PerformanceResultEnum.PLATFORM_ACCOUNT_CONFIG_ONLY);
         }
@@ -78,6 +84,7 @@ public class PlatformAccountConfigServiceImpl implements PlatformAccountConfigSe
 
     @Override
     public void savePlatformAccountConfig(SavePlatformAccountConfigParam param){
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         PlatformAccountConfig config = new PlatformAccountConfig();
         config.setBusinessType(param.getBusinessType());
         config.setOwnerType(param.getOwnerType());
@@ -91,6 +98,8 @@ public class PlatformAccountConfigServiceImpl implements PlatformAccountConfigSe
         config.setBankCode(param.getBankCode());
         config.setBankCardNo(param.getBankCardNo());
         config.setDeleteStatus(DeleteStatusEnum.YES.getCode());
+        config.setCreateUserNo(loginUserInfo.getUserNo());
+        config.setCreateUserName(loginUserInfo.getShadowUserName());
         if(!checkConfigOnly(config)){
             throw new ServiceSystemException(PerformanceResultEnum.PLATFORM_ACCOUNT_CONFIG_ONLY);
         }