联调修复退款相关bug

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

@@ -1186,8 +1186,9 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                     R<String> stringR = xsbPushRefundOrderService.pushRefundStatus(orderRefund);
                     if (!stringR.isSuccess()){
                         log.error("推送市民请集合审核状态失败,{},{}",stringR.getMsg(),JSONObject.toJSON(stringR));
+                    }else {
+                        log.info("推送市民请集合审核状态成功");
                     }
-                    log.info("推送市民请集合审核状态成功");
                 }
 
             } catch (Exception e) {

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

@@ -57,6 +57,7 @@ public class XSBPushRefundOrderServiceImpl implements XSBPushRefundOrderService
      */
     @Override
     public R<String> pushRefundStatus(OrderRefund orderRefund) {
+        log.info("推送市民请集合状态请求参数,{}", com.alibaba.fastjson2.JSONObject.toJSONString(orderRefund));
         if (orderRefund==null){
             return R.FAIL("退款订单信息不存在");
         }
@@ -64,10 +65,11 @@ public class XSBPushRefundOrderServiceImpl implements XSBPushRefundOrderService
             return R.FAIL("退款订单信息不属于市民请集合订单,不允许推送");
         }
         RefundOrderPushStatusVo refundOrderPushStatusVo = new RefundOrderPushStatusVo();
-        refundOrderPushStatusVo.setRefundNumber(orderRefund.getOrderNumber());
+        refundOrderPushStatusVo.setRefundNumber(orderRefund.getRefundSn());
         refundOrderPushStatusVo.setReturnMoneySts(orderRefund.getReturnMoneySts());
         refundOrderPushStatusVo.setApplyType(orderRefund.getApplyType());
-        String post = HttpUtil.post("http://192.168.1.166:8114/api/v1/xsb/receiveRefundStatus", orderRefund);
+        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);
         if (StringUtils.isNotEmpty(post)){
             Result result = JSONObject.parseObject(post, Result.class);
             if (result==null){

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

@@ -96,7 +96,7 @@ public class XSBRefundOrderServiceImpl implements XSBRefundOrderService {
         List<OrderRefundSku> orderRefundSkuList = new ArrayList<>();
         List<OmsOrderRefundSkuVo> omsOrderRefundSkuVos = refundOrderPushVo.getOrderRefundSkuList();
         for (OmsOrderRefundSkuVo omsOrderRefundSkuVo : omsOrderRefundSkuVos) {
-            OrderItem orderItem =  orderItemMapper.findBySkuIdAndOrderNumber(omsOrderRefundSkuVo.getSkuId(),refundOrderPushVo.getOrderNumber());//由于王明推送订单时并没有在第三方(市民请集合)保存本系统id，并且直接将那边的skuId等相关信息直接传输过来，导致只能根据第三方的skuId和订单编号信息去进行查询
+            OrderItem orderItem =  orderItemMapper.findBySkuIdAndOrderNumber(omsOrderRefundSkuVo.getThirdSkuId(),refundOrderPushVo.getOrderNumber());//由于王明推送订单时并没有在第三方(市民请集合)保存本系统id，并且直接将那边的skuId等相关信息直接传输过来，导致只能根据第三方的skuId和订单编号信息去进行查询
             if (orderItem==null){
                 return R.FAIL("订单项;渠道订单项id："+omsOrderRefundSkuVo.getId()+";不存在");
             }
@@ -229,7 +229,7 @@ public class XSBRefundOrderServiceImpl implements XSBRefundOrderService {
         newOrderRefund.setUpdateTime(new Date());
         newOrderRefund.setFreightAmount(refundOrderPushVo.getFreightAmount().setScale(2, RoundingMode.HALF_UP).doubleValue());
         newOrderRefund.setOffsetPoints(0L);
-
+        newOrderRefund.setChannelType(refundOrderPushVo.getChannelType());
         OrderRefund orderRefund = orderRefundService.applyRefund(newOrderRefund);
         if (!orderRefundSkuList.isEmpty()) {
             orderRefundSkuList.forEach(c -> {