解决合并代码冲突

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

@@ -25,13 +25,13 @@ import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.HttpUtil;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.common.util.R;
-import com.yami.shop.config.SMConstants;
 import com.yami.shop.security.comment.dao.AppConnectMapper;
 import com.yami.shop.security.comment.model.AppConnect;
 import com.yami.shop.security.platform.util.SecurityUtils;
 import com.yami.shop.service.*;
 import com.yami.shop.sys.service.SysUserService;
 import com.yami.shop.utils.CullenUtils;
+import com.yami.shop.utils.SmqjhUtil;
 import com.yami.shop.wx.service.impl.WxProviderServiceImpl;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -70,13 +70,14 @@ public class OrderController {
     private final DeliveryService deliveryService;
     private final OrderSettlementService orderSettlementService;
     private final AppConnectMapper appConnectMapper;
-
+    private final SmqjhUtil smqjhUtil;
     @Autowired
     private SysUserService sysUserService;
 
     @Autowired
     private ExportTaskService exportTaskService;
 
+
     /**
      * 分页获取
      */
@@ -260,7 +261,7 @@ public class OrderController {
                 map.put("dvyNo", delivery.getDvyNo());
                 map.put("dvyName", delivery.getDvyName());
             }
-            System.out.println(HttpUtil.post(SMConstants.SM_BASE_URL + "/api/v1/xsb/order/updateDeliveryStatus", map));
+            System.out.println(HttpUtil.post(smqjhUtil.getOmsBaseUrl() + "/api/v1/xsb/order/updateDeliveryStatus", map));
         }
     }
 

yami-shop-platform/src/main/resources/application-dev.yml

@@ -26,7 +26,7 @@ hb:
 
 smqjh:
 #    pms-url: http://192.168.1.253:8802/api/v1/sync
-    pms-url: http://192.168.1.166:8080/smqjh-pms/api/v1/sync
-    oms-url: http://192.168.1.166:8080/smqjh-oms
+    pms-url: http://192.168.1.242:8080/smqjh-pms/api/v1/sync
+    omsBaseUrl: http://47.109.84.152:8081/smqjh-oms
 
 

yami-shop-platform/src/main/resources/application-prod.yml

@@ -28,4 +28,4 @@ smqjh:
 #  pms-url: http://47.109.39.185:8080/smqjh-pms/api/v1/sync
 #  pms-url: http://192.168.1.242:8080/smqjh-pms/api/v1/sync
   pms-url: https://smqjh.api.zswlgz.com/smqjh-pms/api/v1/sync
-  oms-url: http://smqjh.api.zswlgz.com/smqjh-oms
+  omsBaseUrl: https://smqjh.api.zswlgz.com/smqjh-oms

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

@@ -188,82 +188,84 @@ public class HBOrderService implements IHBOrderService {
         orderMapper.updateById(order);
 
         //取消订单
-        if (operatorType == 60 && !order.getOrderType().equals(4)) {
+        if (operatorType == 60) {
             log.info("取消订单{}", channelOrderId);
             changeOrderStatus(channelOrderId, 60);
-            //创建退款单
-            OrderRefundParam orderRefundParam = new OrderRefundParam();
-            orderRefundParam.setOrderNumber(order.getOrderNumber());
-            orderRefundParam.setApplyType(1);
-            orderRefundParam.setRefundType(1);
-            orderRefundParam.setIsReceiver(false);
-            orderRefundParam.setBuyerReason("17");
-            orderRefundParam.setBuyerDesc(bodyJson.getString("reason"));
-            orderRefundParam.setBuyerMobile(order.getUserMobile());
-            orderRefundParam.setGoodsNum(order.getProductNums());
-            orderRefundParam.setRefundAmount(order.getActualTotal());
-            orderRefundParam.setPhotoFiles("");
-
-            List<OrderItem> listByOrderNumber = orderItemMapper.getListByOrderNumber(order.getOrderNumber());
-            List<OrderRefundSku> orderRefundSkuList = new ArrayList<>();
-            for (OrderItem orderItem : listByOrderNumber) {
-
-                // 查询该订单项的所有退款记录
-                List<OrderRefund> orderRefundList = orderRefundService.list(new LambdaQueryWrapper<OrderRefund>()
-                        .eq(OrderRefund::getOrderNumber, orderRefundParam.getOrderNumber())
-                        .eq(OrderRefund::getReturnMoneySts, 70)
-                        .eq(OrderRefund::getOrderItemId, orderItem.getOrderItemId()));
-
-                if (ObjectUtil.isNotEmpty(orderRefundList)) {
-                    // 计算该订单项已退款的总数量(通过退款单查询退款商品)
-                    List<OrderRefundSkuVo> orderRefundSkuVos = orderRefundSkuMapper.selectByRefundId(orderItem.getOrderItemId());
-                    Integer totalRefundedCount = orderRefundSkuVos.stream()
-                            .mapToInt(OrderRefundSkuVo::getProductCount)
-                            .sum();
-
-                    // 计算剩余可退款数量
-                    Integer remainingCount = orderItem.getProdCount() - totalRefundedCount;
-
-                    if (remainingCount > 0) {
-                        // 数量不同，添加剩余数量
+            if (!order.getOrderType().equals(4)) {
+                //创建退款单
+                OrderRefundParam orderRefundParam = new OrderRefundParam();
+                orderRefundParam.setOrderNumber(order.getOrderNumber());
+                orderRefundParam.setApplyType(1);
+                orderRefundParam.setRefundType(1);
+                orderRefundParam.setIsReceiver(false);
+                orderRefundParam.setBuyerReason("17");
+                orderRefundParam.setBuyerDesc(bodyJson.getString("reason"));
+                orderRefundParam.setBuyerMobile(order.getUserMobile());
+                orderRefundParam.setGoodsNum(order.getProductNums());
+                orderRefundParam.setRefundAmount(order.getActualTotal());
+                orderRefundParam.setPhotoFiles("");
+
+                List<OrderItem> listByOrderNumber = orderItemMapper.getListByOrderNumber(order.getOrderNumber());
+                List<OrderRefundSku> orderRefundSkuList = new ArrayList<>();
+                for (OrderItem orderItem : listByOrderNumber) {
+
+                    // 查询该订单项的所有退款记录
+                    List<OrderRefund> orderRefundList = orderRefundService.list(new LambdaQueryWrapper<OrderRefund>()
+                            .eq(OrderRefund::getOrderNumber, orderRefundParam.getOrderNumber())
+                            .eq(OrderRefund::getReturnMoneySts, 70)
+                            .eq(OrderRefund::getOrderItemId, orderItem.getOrderItemId()));
+
+                    if (ObjectUtil.isNotEmpty(orderRefundList)) {
+                        // 计算该订单项已退款的总数量(通过退款单查询退款商品)
+                        List<OrderRefundSkuVo> orderRefundSkuVos = orderRefundSkuMapper.selectByRefundId(orderItem.getOrderItemId());
+                        Integer totalRefundedCount = orderRefundSkuVos.stream()
+                                .mapToInt(OrderRefundSkuVo::getProductCount)
+                                .sum();
+
+                        // 计算剩余可退款数量
+                        Integer remainingCount = orderItem.getProdCount() - totalRefundedCount;
+
+                        if (remainingCount > 0) {
+                            // 数量不同，添加剩余数量
+                            OrderRefundSku orderRefundSku = new OrderRefundSku();
+                            orderRefundSku.setOrderItemId(orderItem.getOrderItemId());
+                            orderRefundSku.setSkuId(orderItem.getSkuId());
+                            orderRefundSku.setProductCount(remainingCount); // 设置剩余数量
+                            orderRefundSku.setSkuPrice(orderItem.getPrice());
+                            orderRefundSkuList.add(orderRefundSku);
+                        }
+                        // 如果remainingCount <= 0，说明已全部退款，不添加到列表
+                    } else {
+                        // 没有退款记录，正常添加全部数量
                         OrderRefundSku orderRefundSku = new OrderRefundSku();
                         orderRefundSku.setOrderItemId(orderItem.getOrderItemId());
                         orderRefundSku.setSkuId(orderItem.getSkuId());
-                        orderRefundSku.setProductCount(remainingCount); // 设置剩余数量
+                        orderRefundSku.setProductCount(orderItem.getProdCount());
                         orderRefundSku.setSkuPrice(orderItem.getPrice());
                         orderRefundSkuList.add(orderRefundSku);
                     }
-                    // 如果remainingCount <= 0，说明已全部退款，不添加到列表
-                } else {
-                    // 没有退款记录，正常添加全部数量
-                    OrderRefundSku orderRefundSku = new OrderRefundSku();
-                    orderRefundSku.setOrderItemId(orderItem.getOrderItemId());
-                    orderRefundSku.setSkuId(orderItem.getSkuId());
-                    orderRefundSku.setProductCount(orderItem.getProdCount());
-                    orderRefundSku.setSkuPrice(orderItem.getPrice());
-                    orderRefundSkuList.add(orderRefundSku);
                 }
+                if (ObjectUtil.isEmpty(orderRefundSkuList)) {
+                    return;
+                }
+                orderRefundParam.setOrderRefundSkuList(orderRefundSkuList);
+
+                OrderRefund orderRefund1 = orderRefundService.getOne(new LambdaQueryWrapper<OrderRefund>()
+                        .eq(OrderRefund::getOrderNumber, orderRefundParam.getOrderNumber())
+                        .notIn(OrderRefund::getReturnMoneySts, Arrays.asList(30, 40, 70)));
+                log.info(" 申请系统退款未处理数据参数:{}", JSONObject.toJSONString(orderRefund1));
+                if (ObjectUtil.isNotEmpty(orderRefund1)) {
+                    orderRefund1.setReturnMoneySts(ReturnMoneyStsType.REJECT.value());
+                    orderRefundService.updateById(orderRefund1);
+                    //退款单状态同步驳回
+                    orderRefundService.changeStatus(orderRefund1.getRefundSn(), ReturnMoneyStsType.REJECT.value());
+
+                    //生成流程记录
+                    orderRefundService.addOrderRefundRecord(orderRefund1.getRefundId(), 20, 10, "驳回单个商家整单处理");
+                }
+                OrderRefund orderRefund = orderService.applyAgain(orderRefundParam, ReturnMoneyStsType.SUCCESS.value());
+                orderRefundService.createRefundOrder(order.getOrderNumber(), orderRefund.getRefundSn());
             }
-            if (ObjectUtil.isEmpty(orderRefundSkuList)) {
-                return;
-            }
-            orderRefundParam.setOrderRefundSkuList(orderRefundSkuList);
-
-            OrderRefund orderRefund1 = orderRefundService.getOne(new LambdaQueryWrapper<OrderRefund>()
-                    .eq(OrderRefund::getOrderNumber, orderRefundParam.getOrderNumber())
-                    .notIn(OrderRefund::getReturnMoneySts, Arrays.asList(30, 40, 70)));
-            log.info(" 申请系统退款未处理数据参数:{}", JSONObject.toJSONString(orderRefund1));
-            if (ObjectUtil.isNotEmpty(orderRefund1)) {
-                orderRefund1.setReturnMoneySts(ReturnMoneyStsType.REJECT.value());
-                orderRefundService.updateById(orderRefund1);
-                //退款单状态同步驳回
-                orderRefundService.changeStatus(orderRefund1.getRefundSn(), ReturnMoneyStsType.REJECT.value());
-
-                //生成流程记录
-                orderRefundService.addOrderRefundRecord(orderRefund1.getRefundId(), 20, 10, "驳回单个商家整单处理");
-            }
-            OrderRefund orderRefund = orderService.applyAgain(orderRefundParam, ReturnMoneyStsType.SUCCESS.value());
-            orderRefundService.createRefundOrder(order.getOrderNumber(), orderRefund.getRefundSn());
         }
         //成功直接通知海博
         if (order.getHbOrderStatus() == 80) {
@@ -329,6 +331,20 @@ public class HBOrderService implements IHBOrderService {
             orderRiderLocation.setCreateTime(new Date());
             orderRiderLocationMapper.insert(orderRiderLocation);
         }
+
+        //TODO 市民请集合配送员位置
+        Order order = orderMapper.getOrderAndOrderItemByOrderNumber(channelOrderId);
+        if (order.getOrderType().equals(4)) {
+            Map<Object, Object> map = new LinkedTreeMap<>();
+            map.put("orderNumber", orderRiderLocation.getOrderNumber());
+            map.put("courierName", orderRiderLocation.getCourierName());
+            map.put("courierPhone", orderRiderLocation.getCourierPhone());
+            map.put("pushTime", orderRiderLocation.getPushTime());
+            map.put("latitude", orderRiderLocation.getLatitude());
+            map.put("longitude", orderRiderLocation.getLongitude());
+            HttpUtil.post(SMConstants.SM_BASE_URL + "/api/v1/xsb/order/addOrUpdateRiderLocation", map);
+        }
+
     }
 
     @Override

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

@@ -1107,7 +1107,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 changeStatus(orderRefund.getRefundSn(), orderRefund.getReturnMoneySts());
                 if (ChannelType.SMQJH.value().equals(orderRefund.getChannelType())){
                     //当属于市民请集合的订单的时候，直接回推市民请集合进行退款逻辑处理;
-                    HttpUtil.get(smqjhUtil.getSmqjhOmsUrl()+SmqjhUtil.omsSmqjhRefundPointsHandleUrl+orderRefund.getRefundSn());
+                    HttpUtil.get(smqjhUtil.getOmsBaseUrl()+SmqjhUtil.omsSmqjhRefundPointsHandleUrl+orderRefund.getRefundSn());
 
                 }else {
                     orderService.returnRefund(orderRefund.getOrderNumber());
@@ -1115,7 +1115,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             }
         } catch (Exception e) {
             log.error("海博退款订单查询异常：{}", e);
-            HBR.error("未知异常");
+            return HBR.error("未知异常");
         }
 
         log.info("退款订单信息，返回：{}", thirdPartyRefundRequest);
@@ -1199,7 +1199,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             }
         } catch (Exception e) {
             log.error("海博退款订单查询异常：{}", e);
-            HBR.error("未知异常");
+            return HBR.error("未知异常");
         }
 
         return HBR.success();
@@ -1249,7 +1249,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             changeStatus(orderRefund.getRefundSn(), orderRefund.getReturnMoneySts());
           } catch (Exception e) {
             log.error("海博退款订单查询异常：{}", e);
-            HBR.error("未知异常");
+            return HBR.error("未知异常");
         }
 
         return HBR.success();
@@ -1326,7 +1326,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             createRefundOrder(order.getOrderNumber(), orderRefund1.getRefundSn());
         } catch (Exception e) {
             log.error("海博退款订单查询异常：{}", e);
-            HBR.error("未知异常");
+            return HBR.error("未知异常");
         }
 
         return HBR.success();

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

@@ -890,6 +890,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 List<OrderItem> orderItems = orderItemMapper.getListByOrderNumber(c.getOrderNumber());
                 c.setOrderItems(orderItems);
                 c.setGoodsTotalCount(orderItems.stream().map(OrderItem::getProdCount).reduce(0, Integer::sum));
+                c.setReceiver(c.getConsigneeName());
+                c.setUserMobile(c.getConsigneeMobile());
             });
         }
         return page;

yami-shop-service/src/main/java/com/yami/shop/service/xsb/impl/XSBPushRefundOrderServiceImpl.java

@@ -70,7 +70,7 @@ public class XSBPushRefundOrderServiceImpl implements XSBPushRefundOrderService
         refundOrderPushStatusVo.setReturnMoneySts(orderRefund.getReturnMoneySts());
         refundOrderPushStatusVo.setApplyType(orderRefund.getApplyType());
         log.info("推送市民请集合状态推送请求参数,{}", com.alibaba.fastjson2.JSONObject.toJSONString(refundOrderPushStatusVo));
-        String post = HttpUtil.post(smqjhUtil.getSmqjhOmsUrl()+SmqjhUtil.omsSmqjhRefundUrlUpdateStatus, refundOrderPushStatusVo);
+        String post = HttpUtil.post(smqjhUtil.getOmsBaseUrl()+SmqjhUtil.omsSmqjhRefundUrlUpdateStatus, refundOrderPushStatusVo);
         if (StringUtils.isNotEmpty(post)){
             Result result = JSONObject.parseObject(post, Result.class);
             if (result==null){

yami-shop-service/src/main/java/com/yami/shop/utils/SmqjhUtil.java

@@ -1,13 +1,10 @@
 package com.yami.shop.utils;
 
-import com.yami.shop.bean.dto.hb.HBBaseReq;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
-import static cn.hutool.crypto.SecureUtil.md5;
-
 
 /**
  * 海博签名工具类
@@ -24,9 +21,10 @@ public class SmqjhUtil {
     private String smqjhPmsUrl;
 
 
+
     @Getter
-    @Value("${smqjh.oms-url}")
-    private String smqjhOmsUrl;
+    @Value("${smqjh.omsBaseUrl}")
+    private String omsBaseUrl;
 
     /**
      * pms