解决海博添加商品问题

yami-shop-bean/src/main/java/com/yami/shop/bean/model/Order.java

@@ -102,7 +102,7 @@ public class Order implements Serializable {
     private Integer hbLogisticStatus;
 
     /**
-     * 配送类型（1:快递 2:自提 3：及时配送）
+     * 配送类型（1:快递 2:自提 3：及时配送 10-商家转自送）
      */
     private Integer dvyType;
 

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

@@ -190,4 +190,18 @@ public class HBOrderController {
         return HBR.success();
     }
 
+
+
+    /**
+     * 订单-商家转自送
+     *
+     * @param hBRequest 海博订单发货消息请求参数
+     */
+    @PostMapping("/merchantToSelf")
+    public HBR merchantToSelf(@RequestBody JSONObject hBRequest) {
+        log.info("商家转自送{}", hBRequest);
+        orderService.merchantToSelf(hBRequest);
+        return HBR.success();
+    }
+
 }

yami-shop-service/src/main/java/com/yami/shop/service/hb/IHBOrderService.java

@@ -71,4 +71,10 @@ public interface IHBOrderService {
      * @param hBRequest 海博订单结果请求参数
      */
     void deliveryMsg(JSONObject hBRequest);
+
+    /**
+     * 商家自提接口-结果接口
+     * @param hBRequest 海博订单结果请求参数
+     */
+    void merchantToSelf(JSONObject hBRequest);
 }

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

@@ -357,6 +357,16 @@ public class HBOrderService implements IHBOrderService {
 
     }
 
+    @Override
+    public void merchantToSelf(JSONObject hBRequest) {
+        String bodyStr = hBRequest.getString("body");
+        log.info("订单- 商家自提，body：{}", bodyStr);
+        JSONObject bodyJson = JSON.parseObject(bodyStr);
+        Order order = orderMapper.getOrderAndOrderItemByOrderNumber(bodyJson.getString("channelOrderId"));
+        order.setDvyType(10);
+        orderMapper.updateById(order);
+    }
+
 
     @Override
     public HBR details(JSONObject hbRequest) {

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

@@ -281,7 +281,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
                     ListCategoryForUserVO vo = new ListCategoryForUserVO();
                     vo.setCategoryName(category.getName());
                     vo.setSeq(category.getNum());
-                    vo.setParentId(category.getPid());
+                        vo.setParentId(category.getPid());
                     vo.setCategoryId(category.getId());
                     vo.setIcon(category.getIcon());
 

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

@@ -335,6 +335,9 @@ public class ChannelProdServiceImpl extends ServiceImpl<ChannelProdMapper, Chann
                 channelProd.setShopId(updateShannerProdDTO.getShopId());
                 channelProd.setPurchasePrice(updateShannerProdDTO.getPurchasePrice());
                 channelProd.setDeliveryPrice(updateShannerProdDTO.getDeliveryPrice());
+                if (setChannelPriceDto.getChannelProdPrice() == null){
+                    throw new GlobalException("渠道售价不能为空");
+                }
                 channelProd.setChannelProdPrice(setChannelPriceDto.getChannelProdPrice());
                 channelProd.setRecTime(new Date());
                 channelProd.setIsDelete(0);