新增收支明细来源创客接口，收支明细同步数据查找来源创客后保存

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/valid/NormMonth.java

@@ -17,9 +17,9 @@ import java.lang.annotation.*;
 @Constraint(validatedBy = {NormMonthValidator.class})// 指定约束处理器，也就是时间格式验证是哪个类来做校验
 public @interface NormMonth {
 
-    String pattern() default "^\\d{4}-(0[1-9]|1[0-2])$";
+    String pattern() default "^\\d{4}(0[1-9]|1[0-2])$";
 
-    String message() default "时间格式错误yyyy-MM";
+    String message() default "时间格式错误yyyyMM";
 
     Class<?>[] groups() default { }; // groups用来指定分组，可以让校验采取不同的机制，当前默认未指定任何分组机制，默认每次都要进行校验
 

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/feign/RemoteKxsProductService.java

@@ -5,6 +5,7 @@ import com.kxs.common.core.constant.SecurityConstants;
 import com.kxs.common.core.util.R;
 import com.kxs.product.api.dto.kxsapp.GetActivityMachineByIdAndTimeDTO;
 import com.kxs.product.api.model.*;
+import com.kxs.product.api.vo.kxsapp.shop.ShopOrderDetailVO;
 import com.kxs.product.api.vo.kxsapp.shop.ShopOrderGoodsUserVO;
 import com.kxs.stat.api.vo.GetActivityStatByIdAndTimeVO;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -91,7 +92,6 @@ public interface RemoteKxsProductService {
 	@GetExchange("/machine/loadMachineById")
 	R<KxsMachine> loadMachineById(@RequestParam("id") Integer machineId, @RequestHeader(SecurityConstants.FROM) String from);
 
-
 	/**
 	 * 查询机具循环记录
 	 *

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/config/AesOldCryptoConfig.java

@@ -21,15 +21,6 @@ public class AesOldCryptoConfig {
 	private final static  String ENCODE_MODE = "CBC";
 	private final static  String ENCODE_PADDING = "PKCS7Padding";
 
-	public static void main(String[] args) {
-		AES aes = new AES("CBC", "PKCS7Padding",
-				// 密钥，可以自定义
-				"CBTU1dD4Kd5pyiGWTsI10jRQ3SvKusSV".getBytes(),
-				// iv加盐，按照实际需求添加
-				"DYgjCEIMVrj2W9xN".getBytes());
-		System.out.println(aes.decryptStr("RFlnakNFSU1WcmoyVzl4Tl0lFdbug//AzBamqjjGzESAJcOEu3pcaH2zmRAAQ3O+dTSV4bFG1Ks7leC0GMtFaUEr7CIpniE4CX2AaBp+y60="));
-	}
-
 	/**
 	 * <p>
 	 * aes加密配置 此处设在配置类可以避免每次请求都去创建加密类，以此节约性能

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

@@ -6,13 +6,27 @@ 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.common.core.exception.GlobalCustomerException;
+import com.kxs.common.core.util.R;
+import com.kxs.common.core.util.RetOps;
 import com.kxs.common.mybatis.handler.MonthTableNameHandler;
+import com.kxs.product.api.feign.RemoteKxsProductService;
+import com.kxs.product.api.model.KxsMachine;
+import com.kxs.product.api.model.KxsShopOrder;
+import com.kxs.product.api.vo.kxsapp.shop.ShopOrderDetailVO;
+import com.kxs.transfer.api.mapper.product.KxsMachineMapper;
+import com.kxs.transfer.api.mapper.product.KxsShopOrderMapper;
+import com.kxs.transfer.api.mapper.user.KxsLeaderAmountLogMapper;
 import com.kxs.transfer.api.mapper.user.KxsUserAmountLogMapper;
+import com.kxs.transfer.api.mapper.user.KxsUserMapper;
 import com.kxs.transfer.api.model.table.DMLData;
 import com.kxs.transfer.api.model.table.FieldData;
 import com.kxs.transfer.api.service.user.KxsUserAmountLogService;
+import com.kxs.user.api.model.KxsLeaderAmountLog;
+import com.kxs.user.api.model.KxsUser;
 import com.kxs.user.api.model.KxsUserAmount;
 import com.kxs.user.api.model.KxsUserAmountLog;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -29,8 +43,14 @@ import java.util.Map;
  * @since 2024-01-03 09:39:56
  */
 @Service("kxsUserAmountLogService")
+@RequiredArgsConstructor
 public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMapper, KxsUserAmountLog> implements KxsUserAmountLogService {
 
+    private final KxsLeaderAmountLogMapper kxsLeaderAmountLogMapper;
+
+    private final KxsUserMapper userMapper;
+    private final KxsShopOrderMapper orderMapper;
+    private final KxsMachineMapper machineMapper;
     @Override
     public void changeData(DMLData dmlData) {
         //修改的字段值
@@ -77,6 +97,9 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
                 case "ProductType":
                     userAmountLog.setBrandId(Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;
+                case "Kind":
+                    userAmountLog.setVersion(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
                 case "ChangeType":
                     Integer changeType = Integer.valueOf(validFieldDataMap.get(field).toString());
                     userAmountLog.setVariationType(changeType);
@@ -121,6 +144,36 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
             baseMapper.updateById(userAmountLog);
         }
         if (operation.equals(OperationType.INSERT)) {
+            //来源ID
+            int sourceId = Integer.parseInt(userAmountLog.getVariationCause());
+            if(sourceId > 0) {
+                //来源分类
+                int version = userAmountLog.getVersion();
+                int userId = 0;
+                //盟主收支明细表查找
+                if (version == 101) {
+                    KxsLeaderAmountLog kxsLeaderAmountLog = kxsLeaderAmountLogMapper.selectById(sourceId);
+                    userId = kxsLeaderAmountLog != null ? kxsLeaderAmountLog.getUserId() : 0;
+                }
+                if (version == 0) {
+                    KxsShopOrder kxsShopOrder = orderMapper.selectById(sourceId);
+                    userId = kxsShopOrder != null ? kxsShopOrder.getUserId().intValue() : 0;
+                }
+                //开机奖励
+                if (version == 3 && userAmountLog.getVariationType() == 50) {
+                    KxsMachine kxsMachine = machineMapper.selectById(sourceId);
+                    userId = kxsMachine != null ? kxsMachine.getUserId() : 0;
+                }
+
+
+                //setVariationCause字段表示来源创客ID
+                KxsUser user = userMapper.selectById(userId);
+                if(user != null){
+                    userAmountLog.setVariationCause(String.valueOf(user.getId()));
+                }
+            }
+
+
             KxsUserAmountLog kxsUserAmountLog = baseMapper.selectById(userAmountLog.getId());
             if(kxsUserAmountLog == null){
                 // 插入数据

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/userAccount/UserAmountVariationListDTO.java

@@ -34,8 +34,7 @@ public class UserAmountVariationListDTO {
     /**
      * 月份 2023-08
      */
-    @Schema(description = "月份 2023-08")
-//    @NotBlank(message = "月份不能为空")
+    @Schema(description = "月份 202308")
     @NormMonth
     private String tradeMonth;
 

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/userAccount/SourceUserVO.java

@@ -0,0 +1,35 @@
+package com.kxs.user.api.vo.kxsapp.userAccount;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 收支明细-来源创客
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:59
+ */
+@Data
+@Builder
+@Schema(description = "收支明细-来源创客")
+public class SourceUserVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 创客编号
+     */
+    @Schema(description = "创客编号")
+    private String userCode;
+
+
+	
+
+}

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/controller/kxsapp/UserAccountController.java

@@ -132,6 +132,11 @@ public class UserAccountController {
     public R userAmountVariationList(@ParameterObject Page<UserAmountVariationListVO> page, @Valid @ParameterObject UserAmountVariationListDTO param) {
         return R.ok(kxsUserAmountLogService.getByPage(page, param));
     }
+    @GetMapping("/sourceUser")
+    public R sourceUser(@RequestParam("id") Integer id, @RequestParam("tradeMonth") String tradeMonth){
+
+        return R.ok(kxsUserAmountLogService.sourceUser(id, tradeMonth));
+    }
 
 
     /**
@@ -156,6 +161,7 @@ public class UserAccountController {
 
         return R.ok(kxsUserAmountLogService.variationTypeList(type));
     }
+
     /**
      * 收支明细-获取收益及支出类别明细
      *

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/KxsUserAmountLogService.java

@@ -5,8 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.user.api.dto.kxsapp.userAccount.UserAmountVariationListDTO;
 import com.kxs.user.api.model.KxsUserAmountLog;
-import com.kxs.user.api.vo.kxsapp.userAccount.AmountInExpendTotalVO;
-import com.kxs.user.api.vo.kxsapp.userAccount.UserAmountVariationListVO;
+import com.kxs.user.api.vo.kxsapp.userAccount.*;
+
+import java.util.List;
 
 /**
  * 用户余额记录日志表(KxsUserAmountLog)表服务接口
@@ -40,8 +41,22 @@ public interface KxsUserAmountLogService extends IService<KxsUserAmountLog> {
      * @param kind 类
      * @return {@link Object}
      */
-    Object variationTypeList(String kind);
+    List<VariationTypeListVO> variationTypeList(String kind);
+
+    /**
+     * 获取收益及支出类别明细
+     *
+     * @param changeTypeId 更改类型 ID
+     * @return {@link Object}
+     */
+    List<VariationListVO> variationList(String changeTypeId);
 
-    Object variationList(String changeTypeId);
+    /**
+     * 根据收支明细ID获取来源创客
+     *
+     * @param id 收支明细ID
+     * @return {@link Object}
+     */
+    SourceUserVO sourceUser(Integer id, String tradeMonth);
 }
 

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

@@ -7,18 +7,29 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.common.core.constant.CommonConstants;
+import com.kxs.common.core.constant.SecurityConstants;
+import com.kxs.common.core.constant.enums.ErrorTypeEnum;
 import com.kxs.common.core.constant.enums.KindTypeEnum;
+import com.kxs.common.core.exception.GlobalCustomerException;
+import com.kxs.common.core.util.R;
+import com.kxs.common.core.util.RetOps;
 import com.kxs.common.mybatis.handler.MonthTableNameHandler;
 import com.kxs.common.security.util.SecurityUtils;
+import com.kxs.product.api.feign.RemoteKxsProductService;
+import com.kxs.product.api.model.KxsMachine;
+import com.kxs.product.api.vo.kxsapp.shop.ShopOrderDetailVO;
 import com.kxs.user.api.dto.kxsapp.userAccount.UserAmountVariationListDTO;
 import com.kxs.user.api.model.KxsChangeTypeKind;
-import com.kxs.user.api.vo.kxsapp.userAccount.AmountInExpendTotalVO;
-import com.kxs.user.api.vo.kxsapp.userAccount.UserAmountVariationListVO;
+import com.kxs.user.api.model.KxsLeaderAmountLog;
+import com.kxs.user.api.model.KxsUser;
+import com.kxs.user.api.vo.kxsapp.userAccount.*;
 import com.kxs.common.core.constant.enums.VariationTypeEnum;
-import com.kxs.user.api.vo.kxsapp.userAccount.VariationTypeListVO;
 import com.kxs.user.biz.mapper.KxsChangeTypeKindMapper;
+import com.kxs.user.biz.mapper.KxsLeaderAmountLogMapper;
 import com.kxs.user.biz.mapper.KxsUserAmountLogMapper;
 import com.kxs.user.api.model.KxsUserAmountLog;
+import com.kxs.user.biz.mapper.KxsUserMapper;
 import com.kxs.user.biz.service.KxsUserAmountLogService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -38,15 +49,21 @@ import java.util.Map;
 @Service("kxsUserAmountLogService")
 @RequiredArgsConstructor
 public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMapper, KxsUserAmountLog> implements KxsUserAmountLogService {
+
     private final KxsChangeTypeKindMapper kxsChangeTypeKindMapper;
+
+    private final KxsLeaderAmountLogMapper kxsLeaderAmountLogMapper;
+
+    private final KxsUserMapper userMapper;
+    private final RemoteKxsProductService remoteKxsProductService;
+
     @Override
     public IPage<UserAmountVariationListVO> getByPage(Page<UserAmountVariationListVO> page, UserAmountVariationListDTO param) {
 
         param.setUserId(SecurityUtils.getUser().getId());
         //拼接表名
-        String tableName = param.getTradeMonth();
-        String[] split = tableName.split("-");
-        tableName = "kxs_user_amount_log_" + split[0] + split[1];
+        String tableName = CommonConstants.KXS_USER_AMOUNT_LOG_PREFIX + param.getTradeMonth();
+
         IPage<UserAmountVariationListVO> byPage = baseMapper.getByPage(page, param, tableName);
         for (UserAmountVariationListVO record : byPage.getRecords()) {
             KxsChangeTypeKind kxsChangeTypeKind = kxsChangeTypeKindMapper.selectById(record.getVariationType());
@@ -85,13 +102,34 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
     }
 
     @Override
-    public Object variationTypeList(String kind) {
+    public List<VariationTypeListVO> variationTypeList(String kind) {
         return baseMapper.variationTypeList(kind);
     }
 
     @Override
-    public Object variationList(String changeTypeId) {
+    public List<VariationListVO>  variationList(String changeTypeId) {
         return baseMapper.variationList(changeTypeId);
     }
+
+    @Override
+    public SourceUserVO sourceUser(Integer id, String tradeMonth) {
+
+        SourceUserVO.SourceUserVOBuilder builder = SourceUserVO.builder();
+        MonthTableNameHandler.setData(tradeMonth);
+        KxsUserAmountLog userAmountLog = baseMapper.selectById(id);
+        //删除线程，避免线程污染
+        MonthTableNameHandler.removeData();
+        if(userAmountLog.getVariationCause().isBlank() || "0".equals(userAmountLog.getVariationCause())){
+            return builder.build();
+        }
+        //来源ID
+        int sourceUserId = Integer.parseInt(userAmountLog.getVariationCause());
+
+        KxsUser user = userMapper.selectById(sourceUserId);
+        builder.userCode(user.getUserCode());
+
+
+        return builder.build();
+    }
 }
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/task/KxsUserTaskJob.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.kxs.common.core.constant.CommonConstants;
 import com.kxs.common.core.util.R;
 import com.kxs.common.security.annotation.Inner;
 import com.kxs.system.api.feign.RemoteOldService;
@@ -53,7 +54,7 @@ public class KxsUserTaskJob {
     @GetMapping("/automaticTableCreationTasks")
     public void automaticTableCreationTasks() {
         String thisMoth = LocalDateTimeUtil.format(LocalDate.now().plusMonths(1L), DatePattern.SIMPLE_MONTH_PATTERN);
-        kxsUserAmountLogMapper.automaticTableCreationTasks(PREFIX_TABLE_NAME + thisMoth);
+        kxsUserAmountLogMapper.automaticTableCreationTasks(CommonConstants.KXS_USER_AMOUNT_LOG_PREFIX + thisMoth);
     }
 
     /**