dev合并master

yami-shop-api/src/main/java/com/yami/shop/api/controller/PayNoticeController.java

@@ -77,18 +77,18 @@ public class PayNoticeController {
             List<Order> orders = payService.paySuccess(payInfoBo.getPayNo(), payInfoBo.getBizPayNo(), 1);
 
             //进行拆单处理
-            List<Order> objects = new ArrayList<>();
-            for (Order order : orders) {
-                Channel byId = channelService.getById(order.getChannelId());
-                orderService.cd(order, byId, objects);
-            }
-
-            for (Order order : objects) {
-                //创建子订单
-                orderService.save(order);
-                //推送海博订单
-                hbOrderService.createOrderAsync(order.getOrderNumber());
-            }
+//            List<Order> objects = new ArrayList<>();
+//            for (Order order : orders) {
+//                Channel byId = channelService.getById(order.getChannelId());
+//                orderService.cd(order, byId, objects);
+//            }
+//
+//            for (Order order : objects) {
+//                //创建子订单
+//                orderService.save(order);
+//                //推送海博订单
+//                hbOrderService.createOrderAsync(order.getOrderNumber());
+//            }
 
             // 移除缓存
             for (Order order : orders) {
@@ -98,6 +98,11 @@ public class PayNoticeController {
                     skuService.removeSkuCacheBySkuId(orderItem.getSkuId(), orderItem.getProdId());
                 }
             }
+
+            //推送海博订单
+            for (Order order : orders) {
+                hbOrderService.createOrderAsync(order.getOrderNumber());
+            }
         }
         return ResponseEntity.ok(payInfoBo.getSuccessString());
     }

yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java

@@ -169,6 +169,7 @@ public class UserController {
                 appConnect.setBizUserId(session.getOpenid());
                 appConnect.setBizUnionid(session.getUnionid());
                 appConnectService.save(appConnect);
+
             }
 
             // 加载用户信息

yami-shop-bean/src/main/java/com/yami/shop/bean/vo/ChannelProdExportVO.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
 @Data
 public class ChannelProdExportVO {
 
-    @ExcelProperty(value = "海博商品ID", index = 0)
+    @ExcelProperty(value = "海博商品ID*", index = 0)
     @ColumnWidth(20)
     private Long skuId;
 
@@ -21,11 +21,11 @@ public class ChannelProdExportVO {
     @ColumnWidth(40)
     private String skuName;
 
-    @ExcelProperty(value = "门店名称", index = 3)
+    @ExcelProperty(value = "门店名称*", index = 3)
     @ColumnWidth(20)
     private String shopName;
 
-    @ExcelProperty(value = "销售渠道", index = 2)
+    @ExcelProperty(value = "销售渠道*", index = 2)
     @ColumnWidth(20)
     private String channelName;
 
@@ -37,7 +37,7 @@ public class ChannelProdExportVO {
     @ColumnWidth(20)
     private BigDecimal deliveryPrice;
 
-    @ExcelProperty(value = "渠道售价(元)", index = 6)
+    @ExcelProperty(value = "渠道售价(元)*", index = 6)
     @ColumnWidth(20)
     private BigDecimal channelProdPrice;
 

yami-shop-bean/src/main/java/com/yami/shop/bean/vo/ChannelProdImportVO.java

@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @ContentStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 9) // 内容背景色（9=淡黄色）
 public class ChannelProdImportVO {
 
-    @ExcelProperty(value = "海博商品ID", index = 0)
+    @ExcelProperty(value = "海博商品ID*", index = 0)
     @ColumnWidth(20) // 列宽
     @ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER) // 居中对齐
     private String skuId;
@@ -27,12 +27,12 @@ public class ChannelProdImportVO {
     @ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.LEFT)
     private String skuName;
 
-    @ExcelProperty(value = "销售渠道", index = 2)
+    @ExcelProperty(value = "销售渠道*", index = 2)
     @ColumnWidth(20)
     @ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.LEFT)
     private String channelName;
 
-    @ExcelProperty(value = "门店名称", index = 3)
+    @ExcelProperty(value = "门店名称*", index = 3)
     @ColumnWidth(20)
     @ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.LEFT)
     private String shopName;
@@ -45,7 +45,7 @@ public class ChannelProdImportVO {
     @ColumnWidth(20)
     private BigDecimal deliveryPrice;
 
-    @ExcelProperty(value = "渠道售价(元)", index = 6)
+    @ExcelProperty(value = "渠道售价(元)*", index = 6)
     @ColumnWidth(20)
     private BigDecimal channelProdPrice;
 

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/hb/HBOrderController.java

@@ -1,13 +1,18 @@
 package com.yami.shop.platform.controller.hb;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yami.shop.bean.model.Order;
 import com.yami.shop.common.util.hb.HBR;
+import com.yami.shop.service.OrderService;
 import com.yami.shop.service.hb.IHBOrderService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 海博-订单信息管理
  *
@@ -23,17 +28,28 @@ import org.springframework.web.bind.annotation.*;
 public class HBOrderController {
 
     private final IHBOrderService orderService;
+    private final OrderService orderServicel;
 
     /**
      * 海博订单创建接口-推送接口
      *
-     * @param channelOrderId 海博订单单号
+     * @param orderNumber 订单单号
      * @return 前台类目响应
      */
     @PostMapping("/createOrderAsync")
-    public String addGoods(String channelOrderId) {
-        log.info("海博新增订单{}", channelOrderId);
-        return orderService.createOrderAsync(channelOrderId);
+    public String addGoods(String orderNumber) {
+        log.info("海博新增订单{}", orderNumber);
+//        //查询订单 ID>1354的
+//        List<Order> orders = orderServicel.list(new LambdaQueryWrapper<Order>()
+//                .eq(Order::getIsPayed, 1)
+//                .gt(Order::getOrderId, 1354)
+//                .ne(Order::getActualTotal, 0.00)
+//        );
+//        for (Order order : orders) {
+//            orderService.createOrderAsync(order.getOrderNumber());
+//        }
+
+        return orderService.createOrderAsync(orderNumber);
     }
 
     /**

yami-shop-service/src/main/java/com/yami/shop/dao/ChannelProdMapper.java

@@ -102,4 +102,6 @@ public interface ChannelProdMapper extends BaseMapper<ChannelProd> {
      * @param updateShannerProdDTO 渠道商品
      */
     void deleteChannelProd(UpdateShannerProdDTO updateShannerProdDTO);
+
+
 }

yami-shop-service/src/main/java/com/yami/shop/service/impl/ChannelProdServiceImpl.java

@@ -32,7 +32,6 @@ import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 渠道对应商品管理服务实现类

yami-shop-service/src/main/resources/mapper/ProductMapper.xml

@@ -265,18 +265,6 @@
         ORDER BY p.`sold_num` DESC, p.`update_time` DESC
     </select>
 
-    <!--
-    注意：此查询的分页未生效是因为MyBatis Plus分页插件未能正确应用。
-    可能的原因：
-    1. Page对象未正确传递到Mapper方法
-    2. MyBatis Plus分页拦截器配置问题
-    3. SQL查询结构导致分页拦截器无法正确添加LIMIT子句
-    
-    解决方案：
-    1. 确保Service层正确传递Page对象
-    2. 检查MyBatis Plus配置中的分页拦截器
-    3. 如果问题仍然存在，可考虑手动添加LIMIT子句
-    -->
     <select id="getSearchProdDtoPageByProdName" resultType="com.yami.shop.bean.dto.SearchProdDto">
         SELECT
         p.prod_id,
@@ -286,9 +274,8 @@
         SUM(ss.shop_sku_stocks) AS stocks,
         MIN(cp.channel_prod_price) AS price
         FROM tz_prod p
-        INNER JOIN tz_shop_sku ss ON ss.spu_id = p.prod_id AND ss.shop_id =2 AND ss.is_delete = 0
+        INNER JOIN tz_shop_sku ss ON ss.spu_id = p.prod_id AND ss.shop_id = #{searchParam.shopId} AND ss.is_delete = 0
         INNER JOIN tz_channel_prod cp  ON ss.sku_id = cp.sku_id AND cp.shop_id = #{searchParam.shopId}  AND cp.channel_id = #{searchParam.channelId}  AND cp.is_delete = 0
-
         WHERE p.status = 1
         <if test="searchParam.prodName != null">
             and p.prod_name LIKE CONCAT('%',#{searchParam.prodName},'%')
@@ -829,17 +816,18 @@
         COALESCE (sales_data.sales_volume, 0) AS sales_volume
         FROM tz_prod tp
         INNER JOIN tz_category_prod tcp ON tp.prod_id = tcp.prod_id
-            AND tcp.is_delete = 0 
+            AND tcp.is_delete = 0
             AND tcp.shop_id = #{prodByCategoryIdAndShopIdDTO.shopId}
             AND tcp.category_id = #{prodByCategoryIdAndShopIdDTO.categoryId}
-        LEFT JOIN tz_shop_sku tss ON tss.spu_id = tp.prod_id 
+        LEFT JOIN tz_shop_sku tss ON tss.spu_id = tp.prod_id
             AND tss.shop_id = #{prodByCategoryIdAndShopIdDTO.shopId}
-        INNER JOIN tz_channel_prod cp ON cp.shop_id = tcp.shop_id
+        INNER JOIN tz_channel_prod cp ON cp.shop_id =  #{prodByCategoryIdAndShopIdDTO.shopId}
+            and cp.channel_id = #{prodByCategoryIdAndShopIdDTO.channelId}
             AND cp.sku_id = tss.sku_id
             AND cp.is_delete = 0
             AND cp.channel_prod_price IS NOT NULL
         LEFT JOIN (
-            SELECT 
+            SELECT
                 oi.prod_id,
                 SUM(oi.prod_count) AS sales_volume
             FROM tz_order_item oi
@@ -849,14 +837,8 @@
                 AND o.delete_status = 0
             GROUP BY oi.prod_id
         ) sales_data ON sales_data.prod_id = tp.prod_id
-        <if test="prodByCategoryIdAndShopIdDTO.channelId == null or prodByCategoryIdAndShopIdDTO.channelId == 0">
-            AND cp.channel_id = 1
-        </if>
-        <if test="prodByCategoryIdAndShopIdDTO.channelId != null and prodByCategoryIdAndShopIdDTO.channelId != 0">
-            AND cp.channel_id = #{prodByCategoryIdAndShopIdDTO.channelId}
-        </if>
         WHERE tp.STATUS = 1 AND tp.is_delete = 0
-        GROUP BY tp.prod_id
+        GROUP BY tp.prod_id, tp.prod_name, tcp.shop_id, cp.channel_prod_price, tp.pic, tss.shop_sku_stocks, sales_data.sales_volume
         ORDER BY sales_volume DESC, price ASC
     </select>