Merge branch 'develop' into develop-kjf

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

@@ -117,7 +117,7 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
                     lambda.set(KxsMachine::getMachineType, Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
                 case "PrizeParams":
-                    if(validFieldDataMap.get(field) != null){
+                    if(validFieldDataMap.get(field) != null && !validFieldDataMap.get(field).toString().isEmpty()){
                         machine.setCashPledge(new BigDecimal(validFieldDataMap.get(field).toString()));
                         lambda.set(KxsMachine::getCashPledge, new BigDecimal(validFieldDataMap.get(field).toString()));
                     }else{

kxs-transfer/src/main/java/com/kxs/transfer/api/service/stat/KxsUserNewTradeService.java

@@ -59,7 +59,7 @@ public class KxsUserNewTradeService extends ServiceImpl<KxsUserNewTradeMapper, K
             }
         }
         if (fieldDataMap.get("RecUserAuthNum").getValue() != null) {
-            userNewTrade.setNewCount(Integer.valueOf(fieldDataMap.get("TradeAmount").getValue().toString()));
+            userNewTrade.setNewCount(Integer.valueOf(fieldDataMap.get("RecUserAuthNum").getValue().toString()));
         }
 
 

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

@@ -4,6 +4,7 @@ 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.KindTypeEnum;
 import com.kxs.transfer.api.mapper.user.KxsLeaderAmountLogMapper;
 import com.kxs.transfer.api.model.table.DMLData;
 import com.kxs.transfer.api.service.user.KxsLeaderAmountLogService;
@@ -56,6 +57,14 @@ public class KxsLeaderAmountLogServiceImpl extends ServiceImpl<KxsLeaderAmountLo
                 case "Sort":
                     leaderAmountLog.setVariationType(Integer.parseInt(validFieldDataMap.get(field).toString()));
                     break;
+                case "ChangeType":
+                    int type = Integer.parseInt(validFieldDataMap.get(field).toString());
+                    if(type == 1){
+                        leaderAmountLog.setKind(KindTypeEnum.SUB.getType());
+                    } else {
+                        leaderAmountLog.setKind(KindTypeEnum.ADD.getType());
+                    }
+                    break;
                 case "ChangeAmt":
                     leaderAmountLog.setAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
                     break;

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

@@ -139,7 +139,7 @@ public class KxsPartnerServiceImpl extends ServiceImpl<KxsPartnerMapper, KxsPart
         //操作类型
         OperationType operation = dmlData.getOperation();
         if(operation.equals(OperationType.DELETE)){
-            baseMapper.deleteById(id);
+            kxsPartnerAmountLogMapper.deleteById(id);
             return;
         }
         for (String field : changeFieldList) {

kxs-transfer/src/main/java/com/kxs/transfer/api/task/taskJob.java

@@ -112,6 +112,8 @@ public class taskJob {
                 //合伙人账户余额变动记录表
                 if ("AmountRecordNew".equals(kxsDtsErrorLog.getTableName()) ) {
                     kxsPartnerService.changeAccountLogData(JSON.parseObject(kxsDtsErrorLog.getContent(), DMLData.class));
+                    //删除本条记录
+                    kxsDtsErrorLogService.removeById(kxsDtsErrorLog.getId());
                 }