收支明细添加字段variationTypeName 金额类型名 商城订单详情vo添加id

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopOrderDetailVO.java

@@ -45,14 +45,6 @@ public class ShopOrderDetailVO implements Serializable {
     @Schema(description = "新增时间")
     private LocalDateTime createTime;
 
-
-
-
-
-
-
-
-
     /**
      * 订单号
      */

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopOrderInfoListVO.java

@@ -22,6 +22,8 @@ public class ShopOrderInfoListVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 
+    private Long id;
+
     /**
      * 商品数量
      */

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

@@ -49,7 +49,11 @@ public class UserAmountVariationListVO implements Serializable {
      */
     @Schema(description = "金额类型")
     private Integer variationType;
-
+    /**
+     * 金额类型名
+     */
+    @Schema(description = "金额类型名")
+    private String variationTypeName;
 
     /**
      * 原因

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

@@ -169,7 +169,6 @@ public class UserAccountController {
 
     /**
      * 余额变动
-     *
      * 内部调用
      *
      * @return 收支明细-筛选变动类型

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

@@ -11,13 +11,16 @@ import com.kxs.common.core.constant.enums.KindTypeEnum;
 import com.kxs.common.mybatis.handler.MonthTableNameHandler;
 import com.kxs.common.security.util.SecurityUtils;
 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.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.KxsUserAmountLogMapper;
 import com.kxs.user.api.model.KxsUserAmountLog;
 import com.kxs.user.biz.service.KxsUserAmountLogService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -33,8 +36,9 @@ 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 KxsChangeTypeKindMapper kxsChangeTypeKindMapper;
     @Override
     public IPage<UserAmountVariationListVO> getByPage(Page<UserAmountVariationListVO> page, UserAmountVariationListDTO param) {
 
@@ -43,7 +47,12 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
         String tableName = param.getTradeMonth();
         String[] split = tableName.split("-");
         tableName = "kxs_user_amount_log_" + split[0] + split[1];
-        return baseMapper.getByPage(page, param,tableName);
+        IPage<UserAmountVariationListVO> byPage = baseMapper.getByPage(page, param, tableName);
+        for (UserAmountVariationListVO record : byPage.getRecords()) {
+            KxsChangeTypeKind kxsChangeTypeKind = kxsChangeTypeKindMapper.selectById(record.getVariationType());
+            record.setVariationTypeName(kxsChangeTypeKind.getName());
+        }
+        return byPage;
     }
 
     @Override