商品更新信息修复

lhb-basic/lhb-basic-api/src/main/java/com/kxs/lhb/basic/api/vo/cusmoter/order/MyOrderVO.java

@@ -0,0 +1,33 @@
+package com.kxs.lhb.basic.api.vo.cusmoter.order;
+
+import com.kxs.lhb.basic.api.model.LhbOrder;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 我的订单信息
+ *
+ * @author 系统
+ * @date 2024-10-22 14:41:49
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Schema(description = "我的订单信息")
+public class MyOrderVO extends LhbOrder implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+
+    @Schema(description = "月租价格")
+    private BigDecimal monthFee;
+
+	
+
+}

lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/controller/cusmoter/OrderController.java

@@ -4,12 +4,15 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.toolkit.JoinWrappers;
 import com.kxs.common.core.util.R;
 import com.kxs.common.core.valid.group.Insert;
 import com.kxs.common.core.valid.group.Update;
 import com.kxs.common.idempotent.annotation.Idempotent;
 import com.kxs.common.security.util.SecurityUtils;
+import com.kxs.lhb.basic.api.model.LhbGoodsSku;
 import com.kxs.lhb.basic.api.model.LhbOrder;
+import com.kxs.lhb.basic.api.vo.cusmoter.order.MyOrderVO;
 import com.kxs.lhb.basic.biz.service.LhbOrderService;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -41,8 +44,8 @@ public class OrderController {
     /**
      * 预占号码
      *
-     * @RequestBody param 实体参数
      * @return 下单
+     * @RequestBody param 实体参数
      */
     @Idempotent(expireTime = 30)
     @PostMapping("/prePhone")
@@ -55,10 +58,10 @@ public class OrderController {
     /**
      * 下单
      *
-     * @RequestBody param 实体参数
      * @return 下单
+     * @RequestBody param 实体参数
      */
-    @Idempotent(key = "#makeMobile",expireTime = 15, info = "操作频繁，15秒后重试")
+    @Idempotent(key = "#makeMobile", expireTime = 15, info = "操作频繁，15秒后重试")
     @PostMapping("/submit")
     public R submit(@Validated({Update.class}) @RequestBody LhbOrder param) {
 
@@ -73,9 +76,12 @@ public class OrderController {
      * @return 我的订单
      */
     @GetMapping("/myOrder")
-    public R myOrder(@ParameterObject Page<LhbOrder> page) {
+    public R myOrder(@ParameterObject Page<MyOrderVO> page) {
 
-        return R.ok(lhbOrderService.page(page, Wrappers.lambdaQuery(LhbOrder.class)
+        return R.ok(lhbOrderService.selectJoinListPage(page, MyOrderVO.class, JoinWrappers.lambda(LhbOrder.class)
+                        .selectAsClass(LhbOrder.class, MyOrderVO.class)
+                        .leftJoin(LhbGoodsSku.class,  LhbGoodsSku::getId, LhbOrder::getSkuId)
+                        .selectAs(LhbGoodsSku::getMonthFee, MyOrderVO::getMonthFee)
                         .eq(LhbOrder::getUserId, SecurityUtils.getUser().getId())
                 .orderByDesc(LhbOrder::getId)));
     }
@@ -84,8 +90,8 @@ public class OrderController {
     /**
      * 查看物流信息
      *
-     * @RequestParam param 实体参数
      * @return 查看物流信息
+     * @RequestParam param 实体参数
      */
     @GetMapping("/queryLogistics")
     public R queryLogistics(@RequestParam("id") Integer id) {
@@ -97,8 +103,8 @@ public class OrderController {
     /**
      * 发起支付
      *
-     * @RequestBody param 实体参数
      * @return 发起支付
+     * @RequestBody param 实体参数
      */
     @PostMapping("/payOrder")
     public R payOrder(@RequestBody LhbOrder param) {
@@ -107,8 +113,5 @@ public class OrderController {
     }
 
 
-
-
-
 }
 

lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/mq/RabbiLhbBindQueueListener.java

@@ -1,5 +1,6 @@
 package com.kxs.lhb.basic.biz.mq;
 
+import cn.hutool.core.util.StrUtil;
 import com.kxs.common.core.constant.CommonConstants;
 import com.kxs.common.mq.handlers.IMQSender;
 import com.kxs.lhb.basic.api.amqp.RabbitLhbBindQueueMQ;
@@ -71,10 +72,14 @@ public class RabbiLhbBindQueueListener {
 			}
 			LhbIsvInfo isvInfo = isvInfoService.getByIsvNo(notify.getIsvNo());
 			if(isvInfo == null){
-				log.error("代理商{}信息不存在", notify.getIsvNo());
+				log.error("服务商{}信息不存在", notify.getIsvNo());
 				channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
 				return;
 			}
+			if(StrUtil.isBlank(isvInfo.getOrderUrl())){
+				log.error("服务商{}推送地址为空", notify.getIsvNo());
+				return;
+			}
 
 			//推送
 			boolean result = MarkingModel.builder()

lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/mq/RabbiLhbOrderQueueListener.java

@@ -1,5 +1,6 @@
 package com.kxs.lhb.basic.biz.mq;
 
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
@@ -118,10 +119,14 @@ public class RabbiLhbOrderQueueListener {
 			}
 			LhbIsvInfo isvInfo = isvInfoService.getByIsvNo(notify.getIsvNo());
 			if(isvInfo == null){
-				log.error("代理商{}信息不存在", notify.getIsvNo());
+				log.error("服务商{}信息不存在", notify.getIsvNo());
 				channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
 				return;
 			}
+			if(StrUtil.isBlank(isvInfo.getOrderUrl())){
+				log.error("服务商{}推送地址为空", notify.getIsvNo());
+				return;
+			}
 
 			//推送订单
 			boolean result = MarkingModel.builder()

lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/service/impl/LhbGoodsServiceImpl.java

@@ -179,6 +179,7 @@ public class LhbGoodsServiceImpl extends MPJBaseServiceImpl<LhbGoodsMapper, LhbG
 
         //删除不存在的sku
         goodsSkuService.remove(Wrappers.lambdaQuery(LhbGoodsSku.class)
+                .eq(LhbGoodsSku::getGoodsId, goods.getId())
                 .notIn(LhbGoodsSku::getExternalSkuId, goodsChildList.stream().map(PackagesRes.GoodsChild::getId).toList()));
 
         goodsChildList.forEach(goodsChild -> {
@@ -197,6 +198,7 @@ public class LhbGoodsServiceImpl extends MPJBaseServiceImpl<LhbGoodsMapper, LhbG
             List<PackagesRes.Activities> activities = goodsChild.getActivities();
             //删除不存在的活动
             goodsActivitiesService.remove(Wrappers.lambdaQuery(LhbGoodsActivities.class)
+                            .eq(LhbGoodsActivities::getSkuId, goodsSku.getId())
                     .notIn(LhbGoodsActivities::getActivityCode, activities.stream().map(PackagesRes.Activities::getOfferCode).toList()));
 
             for (PackagesRes.Activities activitiesItem : activities) {