我的资源 接口完成

computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/controller/admin/order/TradeOrderController.java

@@ -13,6 +13,7 @@ import com.luhu.computility.module.trade.dal.dataobject.order.TradeOrderItemDO;
 import com.luhu.computility.module.trade.dal.dataobject.order.TradeOrderLogDO;
 import com.luhu.computility.module.trade.service.order.TradeOrderLogService;
 import com.luhu.computility.module.trade.service.order.TradeOrderQueryService;
+import com.luhu.computility.module.trade.service.order.TradeOrderToResourceService;
 import com.luhu.computility.module.trade.service.order.TradeOrderUpdateService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -51,6 +52,9 @@ public class TradeOrderController {
     @Resource
     private MemberUserApi memberUserApi;
 
+    @Resource
+    private TradeOrderToResourceService tradeOrderToResourceService;
+
     @GetMapping("/page")
     @Operation(summary = "获得交易订单分页")
     @PreAuthorize("@ss.hasPermission('trade:order:query')")
@@ -176,6 +180,8 @@ public class TradeOrderController {
     public CommonResult<Boolean> updateOrderPaid(@RequestBody PayOrderNotifyReqDTO notifyReqDTO) {
         tradeOrderUpdateService.updateOrderPaid(Long.valueOf(notifyReqDTO.getMerchantOrderId()),
                 notifyReqDTO.getPayOrderId());
+        tradeOrderToResourceService.createMyResource(Long.valueOf(notifyReqDTO.getMerchantOrderId()));
+        log.error("更新订单为已支付------------" + notifyReqDTO.getMerchantOrderId());
         log.error("内部支付任务回调 ");
         return success(true);
     }

computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/controller/app/order/AppTradeOrderController.java

@@ -15,6 +15,7 @@ import com.luhu.computility.module.trade.framework.order.config.TradeOrderProper
 import com.luhu.computility.module.trade.service.aftersale.AfterSaleService;
 import com.luhu.computility.module.trade.service.delivery.DeliveryExpressService;
 import com.luhu.computility.module.trade.service.order.TradeOrderQueryService;
+import com.luhu.computility.module.trade.service.order.TradeOrderToResourceService;
 import com.luhu.computility.module.trade.service.order.TradeOrderUpdateService;
 import com.luhu.computility.module.trade.service.price.TradePriceService;
 import com.google.common.collect.Maps;
@@ -57,6 +58,7 @@ public class AppTradeOrderController {
     @Resource
     private TradeOrderProperties tradeOrderProperties;
 
+
     @GetMapping("/settlement")
     @Operation(summary = "获得订单结算信息")
     public CommonResult<AppTradeOrderSettlementRespVO> settlementOrder(@Valid AppTradeOrderSettlementReqVO settlementReqVO) {

computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/dal/dataobject/order/TradeOrderItemDO.java

@@ -61,6 +61,12 @@ public class TradeOrderItemDO extends BaseDO {
      */
     private Long spuId;
     /**
+     * 商品 分类
+     *
+     * 关联 categoryId
+     */
+    private Long categoryId;
+    /**
      * 商品 SPU 名称
      *
      * 冗余 ProductSkuDO 的 spuName 编号

computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/service/order/TradeOrderToResourceService.java

+package com.luhu.computility.module.trade.service.order;
+
+import com.luhu.computility.module.trade.dal.dataobject.order.TradeOrderLogDO;
+import com.luhu.computility.module.trade.service.order.bo.TradeOrderLogCreateReqBO;
+import org.springframework.scheduling.annotation.Async;
+
+import java.util.List;
+
+/**
+ * 交易下单转我的资源 Service 接口
+ *
+ * @author ljq
+ * @since 2025/8/10 15:44
+ */
+public interface TradeOrderToResourceService {
+
+    /**
+     * 交易下单转我的资源
+     * @param orderId 日志记录
+     */
+    void createMyResource(Long orderId);
+
+}

computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/service/order/TradeOrderToResourceServiceImpl.java

+package com.luhu.computility.module.trade.service.order;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.luhu.computility.framework.common.util.json.JsonUtils;
+import com.luhu.computility.module.member.controller.admin.resource.vo.ResourceSaveReqVO;
+import com.luhu.computility.module.member.service.resource.ResourceService;
+import com.luhu.computility.module.trade.controller.app.order.vo.AppTradeOrderDetailRespVO;
+import com.luhu.computility.module.trade.convert.order.TradeOrderConvert;
+import com.luhu.computility.module.trade.convert.order.TradeOrderLogConvert;
+import com.luhu.computility.module.trade.dal.dataobject.order.TradeOrderDO;
+import com.luhu.computility.module.trade.dal.dataobject.order.TradeOrderItemDO;
+import com.luhu.computility.module.trade.dal.dataobject.order.TradeOrderLogDO;
+import com.luhu.computility.module.trade.dal.mysql.order.TradeOrderLogMapper;
+import com.luhu.computility.module.trade.dal.mysql.order.TradeOrderMapper;
+import com.luhu.computility.module.trade.service.order.bo.TradeOrderLogCreateReqBO;
+import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 交易下单日志 Service 实现类
+ *
+ * @author ljq
+ * @since 2025/8/19 13:04
+ */
+@Service
+@Slf4j
+public class TradeOrderToResourceServiceImpl implements TradeOrderToResourceService {
+
+    @Resource
+    private TradeOrderQueryService tradeOrderQueryService;
+
+    @Resource
+    private ResourceService resourceService;
+
+
+    @Override
+    public void createMyResource(Long orderId) {
+        TradeOrderDO order = tradeOrderQueryService.getOrder(orderId);
+        List<TradeOrderItemDO> orderItemList =
+                tradeOrderQueryService.getOrderItemListByOrderId(orderId);
+        resourceService.createResource(convert(order, orderItemList));
+    }
+
+
+
+    public ResourceSaveReqVO convert(TradeOrderDO order, List<TradeOrderItemDO> items) {
+        if ( ObjectUtils.isEmpty(order) || CollectionUtils.isEmpty(items) ) {
+            return null;
+        }
+        ResourceSaveReqVO resourceSaveReqVO = new ResourceSaveReqVO();
+        TradeOrderItemDO tradeOrderItemDO = items.get(0);
+        if (!ObjectUtils.isEmpty(tradeOrderItemDO)) {
+            resourceSaveReqVO.setMemberUserId(order.getUserId());
+            resourceSaveReqVO.setCategoryId(tradeOrderItemDO.getCategoryId());
+            resourceSaveReqVO.setAuth(tradeOrderItemDO.getAuth());
+            resourceSaveReqVO.setTradeOrderId(order.getId());
+            resourceSaveReqVO.setExpDuration(tradeOrderItemDO.getExpDuration());
+            resourceSaveReqVO.setFeeInfo(tradeOrderItemDO.getFeeInfo());
+            List<ResourceSaveReqVO.Property> properties = new ArrayList<>();
+            resourceSaveReqVO.setExpTime(   DateUtil.offsetDay(new Date(), tradeOrderItemDO.getExpDuration()).toLocalDateTime() );
+            for (TradeOrderItemDO.Property property : tradeOrderItemDO.getProperties()) {
+                ResourceSaveReqVO.Property resourceProperty = new ResourceSaveReqVO.Property();
+                resourceProperty.setPropertyId(property.getPropertyId());
+                resourceProperty.setPropertyName(property.getPropertyName());
+                resourceProperty.setValueId(property.getValueId());
+                resourceProperty.setValueName(property.getValueName());
+                properties.add(resourceProperty);
+            }
+            resourceSaveReqVO.setProperties(properties);
+        }
+        log.error("更新订单为已支付------------convert" + JsonUtils.toJsonString(resourceSaveReqVO));
+        return resourceSaveReqVO;
+    }
+}

computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -26,6 +26,9 @@ import com.luhu.computility.module.pay.enums.refund.PayRefundStatusEnum;
 import com.luhu.computility.module.product.api.comment.ProductCommentApi;
 import com.luhu.computility.module.product.api.comment.dto.ProductCommentCreateReqDTO;
 import com.luhu.computility.module.product.api.sku.ProductSkuApi;
+import com.luhu.computility.module.product.api.sku.dto.ProductSkuRespDTO;
+import com.luhu.computility.module.product.api.spu.ProductSpuApi;
+import com.luhu.computility.module.product.api.spu.dto.ProductSpuRespDTO;
 import com.luhu.computility.module.system.api.social.SocialClientApi;
 import com.luhu.computility.module.system.api.social.dto.SocialWxaSubscribeMessageSendReqDTO;
 import com.luhu.computility.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
@@ -121,6 +124,8 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
     @Resource
     private ProductSkuApi productSkuApi;
     @Resource
+    private ProductSpuApi productSpuApi;
+    @Resource
     public SocialClientApi socialClientApi;
     @Resource
     public PayRefundApi payRefundApi;
@@ -233,12 +238,12 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
                                                         TradePriceCalculateRespBO calculateRespBO) {
         List<TradeOrderItemDO> tradeOrderItemDOS = TradeOrderConvert.INSTANCE.convertList(tradeOrderDO, calculateRespBO);
         for (TradeOrderItemDO tradeOrderItemDO : tradeOrderItemDOS) {
-            String auth = productSkuApi.getSku(tradeOrderItemDO.getSkuId()).getAuth();
-            Integer expDuration = productSkuApi.getSku(tradeOrderItemDO.getSkuId()).getExpDuration();
-            String feeInfo = productSkuApi.getSku(tradeOrderItemDO.getSkuId()).getFeeInfo();
-            tradeOrderItemDO.setAuth(auth);
-            tradeOrderItemDO.setExpDuration(expDuration);
-            tradeOrderItemDO.setFeeInfo(feeInfo);
+            ProductSkuRespDTO sku = productSkuApi.getSku(tradeOrderItemDO.getSkuId());
+            ProductSpuRespDTO spu = productSpuApi.getSpu(tradeOrderItemDO.getSpuId());
+            tradeOrderItemDO.setAuth(sku.getAuth());
+            tradeOrderItemDO.setExpDuration(sku.getExpDuration());
+            tradeOrderItemDO.setFeeInfo(sku.getFeeInfo());
+            tradeOrderItemDO.setCategoryId(spu.getCategoryId());
         }
         return tradeOrderItemDOS;
     }

computility-module-member/src/main/java/com/luhu/computility/module/member/controller/admin/resource/vo/ResourcePageReqVO.java

@@ -18,7 +18,7 @@ public class ResourcePageReqVO extends PageParam {
     private Long id;
 
     @Schema(description = "类型", example = "1")
-    private Integer categoryId;
+    private Long categoryId;
 
     @Schema(description = "客户id", example = "19646")
     private Long memberUserId;

computility-module-member/src/main/java/com/luhu/computility/module/member/controller/admin/resource/vo/ResourceRespVO.java

@@ -18,7 +18,7 @@ public class ResourceRespVO {
 
     @Schema(description = "类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("类型")
-    private Integer categoryId;
+    private Long categoryId;
 
     @Schema(description = "客户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19646")
     @ExcelProperty("客户id")
@@ -30,7 +30,7 @@ public class ResourceRespVO {
 
     @Schema(description = "属性")
     @ExcelProperty("属性")
-    private String properties;
+    private List<ResourceSaveReqVO.Property> properties;
 
     @Schema(description = "过期时间")
     @ExcelProperty("过期时间")

computility-module-member/src/main/java/com/luhu/computility/module/member/controller/admin/resource/vo/ResourceSaveReqVO.java

@@ -3,6 +3,8 @@ package com.luhu.computility.module.member.controller.admin.resource.vo;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.io.Serializable;
 import java.util.*;
 import javax.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -18,7 +20,7 @@ public class ResourceSaveReqVO {
 
     @Schema(description = "类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "类型不能为空")
-    private Integer categoryId;
+    private Long categoryId;
 
     @Schema(description = "客户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19646")
     @NotNull(message = "客户id不能为空")
@@ -28,9 +30,6 @@ public class ResourceSaveReqVO {
     @NotNull(message = "关联订单id不能为空")
     private Long tradeOrderId;
 
-    @Schema(description = "属性")
-    private String properties;
-
     @Schema(description = "过期时间")
     private LocalDateTime expTime;
 
@@ -47,10 +46,36 @@ public class ResourceSaveReqVO {
     private Integer expDuration;
 
     @Schema(description = "剩余使用次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "14711")
-    @NotNull(message = "剩余使用次数不能为空")
+    //@NotNull(message = "剩余使用次数不能为空")
     private Integer unuseCount;
 
     @Schema(description = "备注", example = "你说的对")
     private String remark;
 
+    /**
+     * 属性
+     */
+    @Schema(description = "属性数组")
+    private List<Property> properties;
+
+    @Schema(description = "商品属性")
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Property {
+
+        @Schema(description = "属性编号", example = "10")
+        private Long propertyId;
+
+        @Schema(description = "属性名字", example = "颜色")
+        private String propertyName;
+
+        @Schema(description = "属性值编号", example = "10")
+        private Long valueId;
+
+        @Schema(description = "属性值名字", example = "红色")
+        private String valueName;
+
+    }
+
 }
\ No newline at end of file

computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/resource/vo/AppResourcePageReqVO.java

@@ -14,7 +14,7 @@ import static com.luhu.computility.framework.common.util.date.DateUtils.FORMAT_Y
 public class AppResourcePageReqVO extends PageParam {
 
     @Schema(description = "类型", example = "1")
-    private Integer categoryId;
+    private Long categoryId;
 
     @Schema(description = "关联订单id", example = "11797")
     private Long tradeOrderId;

computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/resource/vo/AppResourceRespVO.java

@@ -2,10 +2,12 @@ package com.luhu.computility.module.member.controller.app.resource.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.luhu.computility.module.member.controller.admin.resource.vo.ResourceSaveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "用户App - 用户资源 Response VO")
 @Data
@@ -16,9 +18,9 @@ public class AppResourceRespVO {
     @ExcelProperty("主键")
     private Long id;
 
-    @Schema(description = "类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("类型")
-    private Integer categoryId;
+    @Schema(description = "分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("分类")
+    private Long categoryId;
 
     @Schema(description = "关联订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "11797")
     @ExcelProperty("关联订单id")
@@ -26,7 +28,7 @@ public class AppResourceRespVO {
 
     @Schema(description = "属性")
     @ExcelProperty("属性")
-    private String properties;
+    private List<ResourceSaveReqVO.Property> properties;
 
     @Schema(description = "过期时间")
     @ExcelProperty("过期时间")

computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/resource/vo/AppResourceSaveReqVO.java

@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.List;
 
-@Schema(description = "管理后台 - 用户资源新增/修改 Request VO")
+@Schema(description = "用户app - 用户资源新增/修改 Request VO")
 @Data
 public class AppResourceSaveReqVO {
 
@@ -16,9 +16,9 @@ public class AppResourceSaveReqVO {
     @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "7191")
     private Long id;
 
-    @Schema(description = "类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "类型不能为空")
-    private Integer categoryId;
+    private Long categoryId;
 
     @Schema(description = "客户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19646")
     @NotNull(message = "客户id不能为空")
@@ -44,7 +44,7 @@ public class AppResourceSaveReqVO {
     private Integer expDuration;
 
     @Schema(description = "剩余使用次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "14711")
-    @NotNull(message = "剩余使用次数不能为空")
+    //@NotNull(message = "剩余使用次数不能为空")
     private Integer unuseCount;
 
     @Schema(description = "备注", example = "你说的对")

computility-module-member/src/main/java/com/luhu/computility/module/member/dal/dataobject/resource/ResourceDO.java

 package com.luhu.computility.module.member.dal.dataobject.resource;
 
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -13,7 +14,7 @@ import com.luhu.computility.framework.mybatis.core.dataobject.BaseDO;
  *
  * @author ljq
  */
-@TableName("member_resource")
+@TableName(value = "member_resource", autoResultMap = true)
 @KeySequence("member_resource_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -43,7 +44,8 @@ public class ResourceDO extends BaseDO {
     /**
      * 属性
      */
-    private String properties;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<Property> properties;
     /**
      * 过期时间
      */
@@ -69,5 +71,33 @@ public class ResourceDO extends BaseDO {
      */
     private String remark;
 
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Property {
+
+        /**
+         * 属性编号
+         */
+        private Integer propertyId;
+        /**
+         * 属性名字
+         *
+         * 注意：每次属性名字发生变化时，需要更新该冗余
+         */
+        private String propertyName;
+
+        /**
+         * 属性值编号
+         */
+        private Integer valueId;
+        /**
+         * 属性值名字
+         *
+         * 注意：每次属性值名字发生变化时，需要更新该冗余
+         */
+        private String valueName;
+
+    }
 
 }
\ No newline at end of file

computility-module-member/src/main/java/com/luhu/computility/module/member/service/resource/ResourceServiceImpl.java

@@ -79,7 +79,8 @@ public class ResourceServiceImpl implements ResourceService {
 
     @Override
     public PageResult<ResourceDO> getResourcePage(ResourcePageReqVO pageReqVO) {
-        return resourceMapper.selectPage(pageReqVO);
+        PageResult<ResourceDO> resourceDOPageResult = resourceMapper.selectPage(pageReqVO);
+        return resourceDOPageResult;
     }
 
 }
\ No newline at end of file