分类绑定商品处理

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

@@ -178,9 +178,18 @@ public class OrderRefundVo implements Serializable{
     private Boolean handler;
 
     /**
-     * 积分
+     * 订单抵扣积分
      */
     private Long offsetPoints;
+    /**
+     * 订单抵扣积分
+     */
+    private Long OrderOffsetPoints;
+    /**
+     * 订单实际总值（用户实付）积分
+     */
+    private Long OrderActualTotal;
+
     /**
      * 过期的积分
      */

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/HBGoodsService.java

@@ -70,7 +70,6 @@ public class HBGoodsService implements IHBGoodsService {
                 JSONObject innerResult = result.getJSONObject("result");
                 JSONArray productHostInfoDTOS = innerResult.getJSONArray("productHostInfoDTOS");
 
-
                 // 3. 遍历获取每个商品信息
                 for (int i = 0; i < productHostInfoDTOS.size(); i++) {
                     JSONObject productInfo = productHostInfoDTOS.getJSONObject(i);

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

@@ -85,16 +85,18 @@ public class CategoryProdServiceImpl extends ServiceImpl<CategoryProdMapper, Cat
 
         for (Long aLong : prodIdList) {
 
-            CategoryProd categoryProd = categoryPropMapper.selectOne(new LambdaQueryWrapper<CategoryProd>().eq(CategoryProd::getProdId, aLong)
+            List<CategoryProd> categoryProdList = categoryPropMapper.selectList(new LambdaQueryWrapper<CategoryProd>().eq(CategoryProd::getProdId, aLong)
                     .eq(CategoryProd::getIsDelete, 0)
                     .eq(CategoryProd::getShopId, categoryProductDTO.getShopId())
                     .eq(CategoryProd::getCode, categoryProductDTO.getCode()));
 
-            if (ObjectUtils.isEmpty(categoryProd)) {
+            if (ObjectUtils.isEmpty(categoryProdList)) {
                 new GlobalException("该门店分类对应商品ID=" + aLong + " 不存在！请勿重复取消");
             }
-            categoryProd.setIsDelete(1);
-            categoryPropMapper.deleteById(categoryProd);
+            for (CategoryProd categoryProd : categoryProdList) {
+                categoryProd.setIsDelete(1);
+                categoryPropMapper.deleteById(categoryProd);
+            }
         }
 
     }

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

@@ -507,6 +507,8 @@
                o.actual_total    as actualTotal,
                o.product_nums    as productNums,
                o.hb_order_status as hbOrderStatus,
+               o.offset_points as OrderOffsetPoints,
+               o.actual_total as OrderActualTotal,
                tsd.shop_name     as shopName,
                uao.receiver        as receiver
         from tz_order_refund refund