同步用户数据表-用户重新实名认证同步修改

kxs-transfer/src/main/java/com/kxs/transfer/api/service/product/impl/KxsMachineServiceImpl.java

@@ -53,6 +53,7 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
         OperationType operation = dmlData.getOperation();
         UpdateWrapper<KxsMachine> wrapper = new UpdateWrapper<>();
         LambdaUpdateWrapper<KxsMachine> lambda = wrapper.lambda().eq(KxsMachine::getId, id);
+
         for (String field : changeFieldList) {
 
             switch (field) {

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsUserServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.StrUtil;
 import com.aliyun.dts.subscribe.clients.record.OperationType;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,6 +13,7 @@ import com.kxs.common.core.constant.SecurityConstants;
 import com.kxs.common.core.constant.enums.ErrorTypeEnum;
 import com.kxs.common.core.exception.GlobalCustomerException;
 import com.kxs.common.core.util.R;
+import com.kxs.product.api.model.KxsMachine;
 import com.kxs.store.api.feign.RemoteKxsStoreService;
 import com.kxs.store.api.model.KxsWarehouseLimit;
 import com.kxs.system.api.feign.RemoteUserMsgService;
@@ -64,6 +66,9 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         String userId = dmlData.getId();
 
         KxsUser user = new KxsUser();
+        UpdateWrapper<KxsUserReal> wrapper = new UpdateWrapper<>();
+        LambdaUpdateWrapper<KxsUserReal> lambda = wrapper.lambda().eq(KxsUserReal::getUserId, userId);
+
         KxsUserReal userReal = new KxsUserReal();
         KxsUserBank userBank = new KxsUserBank();
         //操作类型
@@ -79,11 +84,15 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
             switch (field) {
                 case "RealName":
-                    user.setUsername(fieldDataMap.get(field).toString());
-                    userReal.setRealName(fieldDataMap.get(field).toString());
+                    if(fieldDataMap.get(field) != null){
+                        user.setUsername(fieldDataMap.get(field).toString());
+                        userReal.setRealName(fieldDataMap.get(field).toString());
+                    }
                     break;
                 case "CertId":
-                    userReal.setIdCard(fieldDataMap.get(field).toString());
+                    if(fieldDataMap.get(field) != null){
+                        userReal.setIdCard(fieldDataMap.get(field).toString());
+                    }
                     break;
                 case "HandCertImage":
                     userReal.setIdCardHand(fieldDataMap.get(field).toString());
@@ -95,19 +104,25 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
                     userReal.setIdCardFront(fieldDataMap.get(field).toString());
                     break;
                 case "SettleBankName":
-                    userBank.setBankName(fieldDataMap.get(field).toString());
+                    if(fieldDataMap.get(field) != null){
+                        userBank.setBankName(fieldDataMap.get(field).toString());
+                    }
                     break;
                 case "Mobile":
                     user.setPhone(fieldDataMap.get(field).toString());
                     break;
                 case "SettleBankCardNo":
-                    userBank.setBankCode(fieldDataMap.get(field).toString());
+                    if(fieldDataMap.get(field) != null){
+                        userBank.setBankCode(fieldDataMap.get(field).toString());
+                    }
                     break;
                 case "BankCardPositiveImage":
                     userBank.setBankPic(fieldDataMap.get(field).toString());
                     break;
                 case "SeoTitle":
-                    userBank.setBankOpen(fieldDataMap.get(field).toString());
+                    if(fieldDataMap.get(field) != null){
+                        userBank.setBankOpen(fieldDataMap.get(field).toString());
+                    }
                     break;
                 case "SettleBankCardName":
                     userBank.setBankCardName(fieldDataMap.get(field).toString());
@@ -144,8 +159,10 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
                     user.setRealStatus(Integer.valueOf(fieldDataMap.get(field).toString()));
                     break;
                 case "AuthDate":
-                    userReal.setCreateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
-                    userBank.setCreateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    if (fieldDataMap.get(field) != null) {
+                        userReal.setCreateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                        userBank.setCreateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    }
                     break;
                 case "Status":
                     if(Integer.parseInt(fieldDataMap.get(field).toString()) == 0 || Integer.parseInt(fieldDataMap.get(field).toString()) == 1){
@@ -223,14 +240,11 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
         if(operation.equals(OperationType.UPDATE)){
 
-            if(BeanUtil.isNotEmpty(user, "entityClass")){
-                user.setId(Integer.valueOf(userId));
-                baseMapper.updateById(user);
-            }
             if(BeanUtil.isNotEmpty(userReal, "entityClass")){
                 KxsUserReal kxsUserReal = kxsUserRealMapper.selectOne(Wrappers.<KxsUserReal>lambdaQuery().eq(KxsUserReal::getUserId, userId));
                 if(kxsUserReal != null){
                     userReal.setId(kxsUserReal.getId());
+                    //如果为注销实名状态
                     kxsUserRealMapper.updateById(userReal);
                 }else{
                     userReal.setUserId(Integer.valueOf(userId));
@@ -247,6 +261,15 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
                     kxsUserBankMapper.insert(userBank);
                 }
             }
+            if(BeanUtil.isNotEmpty(user, "entityClass")){
+                user.setId(Integer.valueOf(userId));
+                baseMapper.updateById(user);
+
+                if(user.getRealStatus() != null && user.getRealStatus() == 0){
+                    kxsUserRealMapper.delete(Wrappers.<KxsUserReal>lambdaQuery().eq(KxsUserReal::getUserId, userId));
+                    kxsUserBankMapper.delete(Wrappers.<KxsUserBank>lambdaQuery().eq(KxsUserBank::getUserId, userId));
+                }
+            }
         }
         //新增数据必然没有实名信息，所以不做操作
         if(operation.equals(OperationType.INSERT)){

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserBank.java

@@ -52,9 +52,7 @@ public class KxsUserBank extends Model<KxsUserBank> implements Serializable {
     /**
      * 删除标记，0未删除，1已删除
      */
-    @TableLogic
     @Schema(description = "删除标记，0未删除，1已删除")
-    @TableField(fill = FieldFill.INSERT)
     private String delFlag;
 
 

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserReal.java

@@ -53,9 +53,7 @@ public class KxsUserReal extends Model<KxsUserReal> implements Serializable {
     /**
      * 删除标记，0未删除，1已删除
      */
-    @TableLogic
     @Schema(description = "删除标记，0未删除，1已删除")
-    @TableField(fill = FieldFill.INSERT)
     private String delFlag;