提货订单详情返回卡密信息

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -4,9 +4,12 @@ import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.NumberUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.admin.domain.Goods;
+import com.qs.mp.admin.domain.GoodsCard;
 import com.qs.mp.admin.domain.GoodsSku;
 import com.qs.mp.admin.domain.vo.ShippingTemplateCalculateVO;
+import com.qs.mp.admin.service.IGoodsCardService;
 import com.qs.mp.admin.service.IGoodsService;
 import com.qs.mp.admin.service.IGoodsSkuService;
 import com.qs.mp.channel.domain.ChannelOrder;
@@ -31,6 +34,7 @@ import com.qs.mp.user.domain.param.DeliverOrderParam;
 import com.qs.mp.user.domain.param.UserDeliverOrderCancelParam;
 import com.qs.mp.user.domain.vo.DeliverOrderSettleVO;
 import com.qs.mp.user.domain.vo.DeliverOrderVO;
+import com.qs.mp.user.domain.vo.UserDeliverOrderItemVO;
 import com.qs.mp.user.service.IUserAddrService;
 import com.qs.mp.user.service.IUserDeliverOrderItemService;
 import com.qs.mp.user.service.IUserDeliverOrderService;
@@ -102,9 +106,14 @@ public class UserDeliverOrderController extends BaseApiController {
     @Autowired
     private IGoodsSkuService goodsSkuService;
 
+
+    @Autowired
+    private IGoodsCardService goodsCardService;
+
     @Value("${shipping.user}")
     public Long shippingTemplateId;
 
+
     /**
      * 订单列表
      */
@@ -143,6 +152,9 @@ public class UserDeliverOrderController extends BaseApiController {
      */
     @PostMapping("/order/detail")
     @ApiOperation(value = "订单详情", notes = "在订单列表页面查看详情")
+    @ApiResponses(
+        @ApiResponse(code = 200, message = "success", response = DeliverOrderVO.class)
+    )
     public AjaxResult query(@RequestBody UserDeliverOrder order) {
         Long userId = SecurityUtils.getLoginUser().getUserId();
         UserDeliverOrder deliverOrder = userDeliverOrderService.getOne(new LambdaQueryWrapper<UserDeliverOrder>()
@@ -160,8 +172,20 @@ public class UserDeliverOrderController extends BaseApiController {
             deliverOrderVO.setAutoConfirmTime(day + "天" + hour + "小时");
         }
 
-        deliverOrderVO.setItems(
-            userDeliverOrderItemService.selectUserDeliverOrderItemVOList(deliverOrder.getOrderId()));
+        List<UserDeliverOrderItemVO> userDeliverOrderItemVOS = userDeliverOrderItemService.selectUserDeliverOrderItemVOList(
+            deliverOrder.getOrderId());
+
+        if (DeliverOrderTypeEnum.CARD.getValue().equals(deliverOrder.getType())) {
+            for (UserDeliverOrderItemVO userDeliverOrderItemVO : userDeliverOrderItemVOS) {
+                QueryWrapper<GoodsCard> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("t1.item_id", userDeliverOrderItemVO.getItemId());
+                queryWrapper.eq("t1.is_deleted", 0);
+                userDeliverOrderItemVO.setCardList(goodsCardService.listDeliveryOrderItemCardByWrapper(queryWrapper));
+            }
+        }
+        deliverOrderVO.setItems(userDeliverOrderItemVOS);
+
+
         deliverOrderVO.setDeliverList(
             userDeliverOrderItemService.getDeliverItemList(order.getOrderId(), deliverOrderVO.getItems()));
         return AjaxResult.success(deliverOrderVO);

mp-service/src/main/java/com/qs/mp/admin/mapper/GoodsCardMapper.java

@@ -1,7 +1,11 @@
 package com.qs.mp.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.qs.mp.admin.domain.GoodsCard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @auther quanshu
@@ -10,4 +14,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface GoodsCardMapper extends BaseMapper<GoodsCard> {
 
+    /**
+     * 查询提货订单明细的商品卡密信息
+     * @param queryWrapper
+     * @return
+     */
+    List<GoodsCard> listDeliveryOrderItemCardByWrapper(@Param(Constants.WRAPPER) QueryWrapper<GoodsCard> queryWrapper);
 }

mp-service/src/main/java/com/qs/mp/admin/service/IGoodsCardService.java

@@ -1,7 +1,9 @@
 package com.qs.mp.admin.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.admin.domain.GoodsCard;
 import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +15,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IGoodsCardService extends IService<GoodsCard> {
 
+    /**
+     * 查询提货订单明细的商品卡密信息
+     * @param queryWrapper
+     * @return
+     */
+    List<GoodsCard> listDeliveryOrderItemCardByWrapper(QueryWrapper<GoodsCard> queryWrapper);
 }

mp-service/src/main/java/com/qs/mp/admin/service/impl/GoodsCardServiceImpl.java

@@ -1,9 +1,11 @@
 package com.qs.mp.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.admin.domain.GoodsCard;
 import com.qs.mp.admin.mapper.GoodsCardMapper;
 import com.qs.mp.admin.service.IGoodsCardService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +19,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class GoodsCardServiceImpl extends ServiceImpl<GoodsCardMapper, GoodsCard> implements IGoodsCardService {
 
+    @Override
+    public List<GoodsCard> listDeliveryOrderItemCardByWrapper(QueryWrapper<GoodsCard> queryWrapper) {
+        return getBaseMapper().listDeliveryOrderItemCardByWrapper(queryWrapper);
+    }
 }

mp-service/src/main/java/com/qs/mp/user/domain/vo/UserDeliverOrderItemVO.java

@@ -1,11 +1,14 @@
 package com.qs.mp.user.domain.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.qs.mp.admin.domain.GoodsCard;
 import com.qs.mp.common.annotation.Excel;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 
+import com.qs.mp.user.domain.UserDeliverOrderItemCard;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
 import lombok.Data;
 
 /**
@@ -57,6 +60,13 @@ public class UserDeliverOrderItemVO extends UserDeliverOrderItem {
     @ApiModelProperty("物流查询接口")
     private String queryUrl;
 
+
+    @ApiModelProperty("卡密使用链接")
+    private String useLink;
+
+    @ApiModelProperty("提货商品卡密信息")
+    private List<GoodsCard> cardList;
+
     public Integer getPrice() {
         if (this.skuValue == null) {
             return this.goodsValue;

mp-service/src/main/resources/mapper/admin/GoodsCardMapper.xml

@@ -19,4 +19,10 @@
         id, goods_id, card_no, card_pwd, is_use, is_deleted, created_time, updated_time
     </sql>
 
+    <select id="listDeliveryOrderItemCardByWrapper" resultMap="BaseResultMap">
+        select t2.*
+        from mp_user_deliver_order_item_card t1
+         left join mp_goods_card t2 on t1.card_id = t2.id
+        ${ew.customSqlSegment}
+  </select>
 </mapper>

mp-service/src/main/resources/mapper/user/UserDeliverOrderItemMapper.xml

@@ -36,7 +36,7 @@
 	
 	 <!-- 查询用户订单明细列表 -->
     <select id="selectUserDeliverOrderItemVOList" resultType="com.qs.mp.user.domain.vo.UserDeliverOrderItemVO">
-		select t1.*, t2.company_name ,t2.company_home_url ,t2.query_url,t3.goods_code,t3.value goodsValue,t3.cost goodsCost,t4.value skuValue,t4.sku_code,t5.name supplierName
+		select t1.*, t2.company_name ,t2.company_home_url ,t2.query_url,t3.goods_code,t3.value goodsValue,t3.cost goodsCost,t3.use_link,t4.value skuValue,t4.sku_code,t5.name supplierName
 		from mp_user_deliver_order_item t1
 		left join mp_delivery_company t2 on t1.delivery_id = t2.delivery_id
         left join mp_goods t3 on t1.goods_id = t3.goods_id