联调修复退款配置

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

@@ -26,6 +26,7 @@ hb:
 
 smqjh:
 #    pms-url: http://192.168.1.253:8802/api/v1/sync
-    pms-url: http://192.168.1.242:8080/smqjh-pms/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/api/v1/sync
 
 

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

@@ -27,4 +27,5 @@ hb:
 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
+  pms-url: https://smqjh.api.zswlgz.com/smqjh-pms/api/v1/sync
+  oms-url: http://smqjh.api.zswlgz.com/smqjh-oms/api/v1/sync

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

@@ -41,6 +41,7 @@ import com.yami.shop.service.*;
 import com.yami.shop.service.xsb.XSBPushRefundOrderService;
 import com.yami.shop.utils.ExportUtils;
 import com.yami.shop.utils.HBSignUtil;
+import com.yami.shop.utils.SmqjhUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import ma.glasnost.orika.MapperFacade;
@@ -103,6 +104,8 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
     @Autowired
     private XSBPushRefundOrderService xsbPushRefundOrderService;
 
+    private final SmqjhUtil smqjhUtil;
+
     //导出
     // 线程池配置
     private final ExecutorService exportExecutor = Executors.newFixedThreadPool(
@@ -1104,7 +1107,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 changeStatus(orderRefund.getRefundSn(), orderRefund.getReturnMoneySts());
                 if (ChannelType.SMQJH.value().equals(orderRefund.getChannelType())){
                     //当属于市民请集合的订单的时候，直接回推市民请集合进行退款逻辑处理;
-                    HttpUtil.get("http://192.168.1.166:8080/api/v1/xsb/handleRefund/"+orderRefund.getRefundSn());
+                    HttpUtil.get(smqjhUtil.getSmqjhOmsUrl()+SmqjhUtil.omsSmqjhRefundPointsHandleUrl+orderRefund.getRefundSn());
 
                 }else {
                     orderService.returnRefund(orderRefund.getOrderNumber());

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

@@ -24,6 +24,7 @@ import com.yami.shop.service.OrderRefundService;
 import com.yami.shop.service.OrderService;
 import com.yami.shop.service.xsb.XSBPushRefundOrderService;
 import com.yami.shop.utils.CullenUtils;
+import com.yami.shop.utils.SmqjhUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -48,7 +49,7 @@ public class XSBPushRefundOrderServiceImpl implements XSBPushRefundOrderService
     @Autowired
     PointsRecordMapper pointsRecordMapper;
 
-
+    private final SmqjhUtil smqjhUtil;
 
     /**
      * 推送市民请集合状态
@@ -69,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("http://192.168.1.166:8080/smqjh-oms/api/v1/xsb/receiveRefundStatus", refundOrderPushStatusVo);
+        String post = HttpUtil.post(smqjhUtil.getSmqjhOmsUrl()+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

@@ -23,13 +23,32 @@ public class SmqjhUtil {
     @Value("${smqjh.pms-url}")
     private String smqjhPmsUrl;
 
+
+    @Getter
+    @Value("${smqjh.oms-url}")
+    private String smqjhOmsUrl;
+
     /**
-     +     * 市民请集合门店修改和新增调用
-     +     */
+     * pms
+    * 市民请集合门店修改和新增调用
+    */
     public static String smqjhMdUrlAddAndUpdate="/shopDetail/save";
-    /**
+    /**pms
      * 市民请集合门店状态修改调用
     */
     public static String smqjhMdUrlUpdateStatus="/shopDetail/updateStatus";
 
+    /**
+     * oms
+     * 市民请集合同步退款订单状态
+     */
+    public static String omsSmqjhRefundUrlUpdateStatus=  "/api/v1/xsb/receiveRefundStatus";
+
+    /**
+     * oms
+     * 市民请集合同步退款处理积分
+     */
+    public static String omsSmqjhRefundPointsHandleUrl= "/api/v1/xsb/handleRefund/";
+
+
 }