修改余额日志没有增减

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/enums/ChangeTypesEnum.java → kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/enums/AmountLogChangeTypesEnum.java

@@ -11,7 +11,7 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum ChangeTypesEnum {
+public enum AmountLogChangeTypesEnum {
 
     ACT(0, "激活奖励"),
     PROFIT(1, "交易分润"),

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsForAmountWithdrawServiceImpl.java

@@ -4,9 +4,8 @@ import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.common.core.constant.SecurityConstants;
-import com.kxs.common.core.constant.enums.ChangeTypesEnum;
+import com.kxs.common.core.constant.enums.AmountLogChangeTypesEnum;
 import com.kxs.common.core.constant.enums.KindTypeEnum;
-import com.kxs.common.core.constant.enums.VariationTypeEnum;
 import com.kxs.common.core.exception.GlobalCustomerException;
 import com.kxs.common.core.util.R;
 import com.kxs.common.core.util.RetOps;
@@ -14,7 +13,6 @@ import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.store.api.dto.kxsapp.storeLimit.ForAmountWithdrawDTO;
 import com.kxs.store.api.model.KxsWarehouseLimit;
 import com.kxs.store.biz.constant.enums.StoreErrorTypeEnum;
-import com.kxs.store.biz.constant.enums.WarehouseLimitTypeEnum;
 import com.kxs.store.biz.mapper.KxsForAmountWithdrawMapper;
 import com.kxs.store.api.model.KxsForAmountWithdraw;
 import com.kxs.store.biz.mapper.KxsWarehouseLimitMapper;
@@ -151,11 +149,11 @@ public class KxsForAmountWithdrawServiceImpl extends ServiceImpl<KxsForAmountWit
         userAmountLog.setKind(KindTypeEnum.ADD.getType());
         //分仓临时额度提现
         if(kxsForAmountWithdraw.getWithdrawType() == 0){
-            userAmountLog.setVariationType(ChangeTypesEnum.FOR_WILL_BE_REFUNDED.getType());
-            userAmountLog.setVariationCause(ChangeTypesEnum.FOR_WILL_BE_REFUNDED.getDescription());
+            userAmountLog.setVariationType(AmountLogChangeTypesEnum.FOR_WILL_BE_REFUNDED.getType());
+            userAmountLog.setVariationCause(AmountLogChangeTypesEnum.FOR_WILL_BE_REFUNDED.getDescription());
         }else{
-            userAmountLog.setVariationType(ChangeTypesEnum.ADVANCE_ISSUANCE_TEMPORARY_QUOTA_REFUND.getType());
-            userAmountLog.setVariationCause(ChangeTypesEnum.ADVANCE_ISSUANCE_TEMPORARY_QUOTA_REFUND.getDescription());
+            userAmountLog.setVariationType(AmountLogChangeTypesEnum.ADVANCE_ISSUANCE_TEMPORARY_QUOTA_REFUND.getType());
+            userAmountLog.setVariationCause(AmountLogChangeTypesEnum.ADVANCE_ISSUANCE_TEMPORARY_QUOTA_REFUND.getDescription());
         }
         userAmountLog.setAmount(BigDecimal.valueOf(param.getYueAmount()));
 

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

@@ -4,6 +4,8 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import com.aliyun.dts.subscribe.clients.record.OperationType;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.common.core.constant.enums.AmountLogChangeTypesEnum;
+import com.kxs.common.core.constant.enums.KindTypeEnum;
 import com.kxs.transfer.api.mapper.user.KxsUserAmountLogMapper;
 import com.kxs.transfer.api.model.table.DMLData;
 import com.kxs.transfer.api.model.table.FieldData;
@@ -13,6 +15,7 @@ import com.kxs.user.api.model.KxsUserAmountLog;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -36,6 +39,9 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
         //操作的主键
         int id = Integer.parseInt(dmlData.getId());
 
+        //增加的changeType
+        List<Integer> adds = Arrays.asList(0, 1, 6, 12, 21, 30, 31, 50, 60, 62, 64, 66, 111, 112, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 126, 127, 128, 129, 130, 131, 133, 134, 135, 136, 137, 301, 311, 312, 313, 314, 315);
+
         KxsUserAmountLog userAmountLog = new KxsUserAmountLog();
         userAmountLog.setId(id);
 
@@ -51,7 +57,14 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
                     userAmountLog.setBrandId(Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "ChangeType":
-                    userAmountLog.setVariationType(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    Integer changeType = Integer.valueOf(validFieldDataMap.get(field).toString());
+                    userAmountLog.setVariationType(changeType);
+                    if (adds.contains(changeType)) {
+                        userAmountLog.setKind(KindTypeEnum.ADD.getType());
+                    }else{
+                        userAmountLog.setKind(KindTypeEnum.SUB.getType());
+                    }
+
                     break;
                 case "ChangeAmount":
                     userAmountLog.setAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
@@ -68,6 +81,9 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
                 case "AfterBalanceAmount":
                     userAmountLog.setAfterAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
                     break;
+                case "Remark":
+                    userAmountLog.setRemark(validFieldDataMap.get(field).toString());
+                    break;
                 case "CreateDate":
                     userAmountLog.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     break;
@@ -77,11 +93,11 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
             }
         }
 
-        if(operation.equals(OperationType.UPDATE)){
+        if (operation.equals(OperationType.UPDATE)) {
             // 更新数据
             baseMapper.updateById(userAmountLog);
         }
-        if(operation.equals(OperationType.INSERT)){
+        if (operation.equals(OperationType.INSERT)) {
             // 插入数据
             baseMapper.insert(userAmountLog);
         }