门店新增问题

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/ShopCategoryController.java

@@ -11,6 +11,7 @@ import com.yami.shop.security.platform.model.YamiSysUser;
 import com.yami.shop.security.platform.util.SecurityUtils;
 import com.yami.shop.service.IShopCategoryService;
 import com.yami.shop.service.ShopDetailService;
+import com.yami.shop.utils.SmqjhUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -40,6 +41,7 @@ public class ShopCategoryController {
 
     private final IShopCategoryService shopCategoryService;
     private final ShopDetailService shopDetailService;
+    private final SmqjhUtil smqjhUtil;
 
     /**
      * 分页查询门店前台类目列表
@@ -165,16 +167,16 @@ public class ShopCategoryController {
         shopCategoryService.updateById(shopCategory);
 
 
-//        ShopCategory dbShopCategory1 = shopCategoryService.getById(shopCategory.getId());
-//        // 将frontCategory数据推送到另一个服务器(POST请求，参数放在请求体)
-//        String syncUrl = smqjhSyncUrl + "/syncFrontCategoryDel/";
-//        try {
-//            // 将frontCategory对象作为JSON放入请求体
-//            String response = com.yami.shop.common.util.HttpUtil.post(syncUrl, dbShopCategory1);
-//            log.info("推送frontCategory到同步服务器结果: {}", response);
-//        } catch (Exception e) {
-//            log.error("推送frontCategory到同步服务器失败: {}", e.getMessage(), e);
-//        }
+        ShopCategory dbShopCategory1 = shopCategoryService.getById(shopCategory.getId());
+        try {
+            String syncUrl = smqjhUtil.getSmqjhPmsUrl() + "/syncShopCategoryData";
+            log.info("推送url: {}",syncUrl);
+            // 将frontCategory对象作为JSON放入请求体
+            String response = com.yami.shop.common.util.HttpUtil.post(syncUrl, dbShopCategory1);
+            log.info("推送frontCategory到同步服务器结果: {}", response);
+        } catch (Exception e) {
+            log.error("推送frontCategory到同步服务器失败: {}", e.getMessage(), e);
+        }
 
         return R.SUCCESS();
     }

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

@@ -555,7 +555,7 @@ public class HBGoodsService implements IHBGoodsService {
     }
 
     @Override
-    public void deleteGoods(JSONObject hbRequest) {
+    public void     deleteGoods(JSONObject hbRequest) {
         JSONObject body = hbRequest.getJSONObject("body");
         log.info("商品删除，body：{}", body);
 
@@ -566,18 +566,20 @@ public class HBGoodsService implements IHBGoodsService {
 
                 String spuId = hbProduct.getString("spuId");
                 String skuId = hbProduct.getString("skuId");
-                Product product;
+                Product product = null;
                 if (ObjectUtil.isNotEmpty(spuId)) {
                     product = productMapper.selectByHbSpuId(spuId);
                 } else {
                     Sku sku = skuMapper.selectByHbSkuId(skuId);
+                    if (ObjectUtil.isNotEmpty(sku)){
                     product = productMapper.selectByHbSpuId(sku.getHbSpuId());
+                    }
                 }
                 if (!ObjectUtil.isEmpty(product)) {
                     product.setIsDelete(1);
                     productMapper.updateById(product);
                     try {
-                        String syncUrl = smqjhUtil.getSmqjhPmsUrl() + "/syncProductDel" + product.getHbSpuId();
+                        String syncUrl = smqjhUtil.getSmqjhPmsUrl() + "/syncProductDel/" + product.getProdId();
                         log.info("推送url: {}", syncUrl);
                         // 将frontCategory对象作为JSON放入请求体
                         String response = com.yami.shop.common.util.HttpUtil.post(syncUrl, product);

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

@@ -253,7 +253,7 @@ public class HBOrderService implements IHBOrderService {
                     orderRefundSkuList.add(orderRefundSku);
                 }
             }
-            if (ObjectUtil.isEmpty(orderRefundSkuList)){
+            if (ObjectUtil.isEmpty(orderRefundSkuList)) {
                 return;
             }
             orderRefundParam.setOrderRefundSkuList(orderRefundSkuList);
@@ -269,7 +269,7 @@ public class HBOrderService implements IHBOrderService {
                 orderRefundService.changeStatus(orderRefund1.getRefundSn(), ReturnMoneyStsType.REJECT.value());
 
                 //生成流程记录
-                orderRefundService.addOrderRefundRecord( orderRefund1.getRefundId(), 20, 10,"驳回单个商家整单处理");
+                orderRefundService.addOrderRefundRecord(orderRefund1.getRefundId(), 20, 10, "驳回单个商家整单处理");
             }
             OrderRefund orderRefund = orderService.applyAgain(orderRefundParam, ReturnMoneyStsType.SUCCESS.value());
             orderRefundService.createRefundOrder(order.getOrderNumber(), orderRefund.getRefundSn());
@@ -354,28 +354,30 @@ public class HBOrderService implements IHBOrderService {
         createOrderRequest.setOutStationName(shopDetail.getShopName());
 
         User userByUserId = userService.getUserByUserId(order.getUserId());
-        createOrderRequest.setCaution(userByUserId.getUserMobile() + "*" + order.getRemarks());
-
-        UserAddrOrder userAddrOrder = userAddrOrderService.selectByAddrOrderId(order.getAddrOrderId());
-        if (userAddrOrder == null) {
-            log.error("收货地址信息查询不到，单号：{}", bodyJson.getString("Order"));
-            createOrderRequest.setRecipientName(shopDetail.getMobile());
-            createOrderRequest.setRecipientPhone(shopDetail.getMobile());
-            createOrderRequest.setRecipientLatitude(Double.parseDouble(shopDetail.getShopLat()));
-            createOrderRequest.setRecipientLongitude(Double.parseDouble(shopDetail.getShopLng()));
-            createOrderRequest.setRecipientAddress(shopDetail.getShopAddress());
-        } else {
-            createOrderRequest.setRecipientName(userAddrOrder.getReceiver());
-            createOrderRequest.setRecipientPhone(userAddrOrder.getMobile());
-            createOrderRequest.setRecipientLatitude(userAddrOrder.getLatitude());
-            createOrderRequest.setRecipientLongitude(userAddrOrder.getLongitude());
-            createOrderRequest.setRecipientAddress(userAddrOrder.getAddress() + userAddrOrder.getAddressName() + userAddrOrder.getAddrDetail());
+        if (userByUserId != null) {
+            createOrderRequest.setCaution(userByUserId.getUserMobile() + "*" + order.getRemarks());
         }
+        if (order.getOrderType() != null && order.getOrderType() == 4) {
+            log.info("市民请结合：{}", bodyJson.getString("Order"));
 
+        } else {
+            UserAddrOrder userAddrOrder = userAddrOrderService.selectByAddrOrderId(order.getAddrOrderId());
+            if (userAddrOrder == null) {
+                log.info("收货地址信息查询不到，单号：{}", bodyJson.getString("Order"));
+                createOrderRequest.setRecipientName(shopDetail.getMobile());
+                createOrderRequest.setRecipientPhone(shopDetail.getMobile());
+                createOrderRequest.setRecipientLatitude(Double.parseDouble(shopDetail.getShopLat()));
+                createOrderRequest.setRecipientLongitude(Double.parseDouble(shopDetail.getShopLng()));
+                createOrderRequest.setRecipientAddress(shopDetail.getShopAddress());
+            } else {
+                createOrderRequest.setRecipientName(userAddrOrder.getReceiver());
+                createOrderRequest.setRecipientPhone(userAddrOrder.getMobile());
+                createOrderRequest.setRecipientLatitude(userAddrOrder.getLatitude());
+                createOrderRequest.setRecipientLongitude(userAddrOrder.getLongitude());
+                createOrderRequest.setRecipientAddress(userAddrOrder.getAddress() + userAddrOrder.getAddressName() + userAddrOrder.getAddrDetail());
+            }
+        }
         int dvyType = 10;
-//        if (order.getDvyType() == 1) {
-//            dvyType = 80;
-//        } else
         if (order.getDvyType() == 2) {
             dvyType = 40;
         }