配送售后退货退款海博库存没加回去处理

yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderRefundController.java

@@ -313,6 +313,20 @@ public class OrderRefundController {
             throw new GlobalException("该订单已有商品正在退款中，不能再进行整单退款");
         }
 
+        List<Integer> returnMoneySts = new ArrayList<>();
+        returnMoneySts.add(ReturnMoneyStsType.APPLY.value());
+        returnMoneySts.add(ReturnMoneyStsType.PROCESSING.value());
+        returnMoneySts.add(ReturnMoneyStsType.CONSIGNMENT.value());
+        returnMoneySts.add(ReturnMoneyStsType.RECEIVE.value());
+        int count = orderRefundService.count(new LambdaQueryWrapper<OrderRefund>()
+                .eq(OrderRefund::getOrderId, order.getOrderId())
+                .in(OrderRefund::getReturnMoneySts, returnMoneySts));
+
+        if (count > 0) {
+            // 处理已存在退款的情况
+            throw new GlobalException("该订单已有退款正在进行中");
+        }
+
         // 生成退款单信息
         OrderRefund newOrderRefund = new OrderRefund();
 

yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java

@@ -48,6 +48,8 @@ public class PayController {
     private final OrderSettlementService orderSettlementService;
     private final WxProviderService wxProviderService;
     private final String baseNotifyUrl ="https://shop.api.zswlgz.com";
+    //测试
+//    private final String baseNotifyUrl ="https://63332824.r36.cpolar.top";
 
 
     @GetMapping("/orderNumber")

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

@@ -92,7 +92,9 @@ public class HBOrderController {
     public HBR updateStatus(@RequestBody JSONObject hBRequest) {
         log.info("海博修改订单状态{}", hBRequest);
         orderService.orderStatusNotify(hBRequest);
-        return HBR.success();
+        JSONObject responseJson = new JSONObject();
+        responseJson.put("result", true);
+        return HBR.success(responseJson);
     }
 
     /**
@@ -127,7 +129,9 @@ public class HBOrderController {
     public HBR orderStatusNotify(@RequestBody JSONObject hBRequest) {
         orderService.orderStatusNotify(hBRequest);
         log.info("海博订单状态变更通知{}", hBRequest);
-        return HBR.success();
+        JSONObject responseJson = new JSONObject();
+        responseJson.put("result", true);
+        return HBR.success(responseJson);
     }
 
 

yami-shop-security/yami-shop-security-api/src/main/java/com/yami/shop/security/api/config/ResourceServerConfiguration.java

@@ -47,7 +47,8 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter
 
                 .authorizeRequests()
                 .antMatchers(
-                        "/p/appointment/**"
+                        "/p/appointment/**",
+                        "/p/order/**"
                         ).permitAll()
                 .and()
 

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

@@ -227,6 +227,8 @@ public class HBOrderService implements IHBOrderService {
             if (ObjectUtil.isNotEmpty(orderRefund1)) {
                 orderRefund1.setReturnMoneySts(ReturnMoneyStsType.SUCCESS.value());
                 orderRefundService.updateById(orderRefund1);
+                //退款单状态同步70
+                orderRefundService.changeStatus(orderRefund1.getRefundSn(), ReturnMoneyStsType.SUCCESS.value());
             } else {
                 OrderRefund orderRefund = orderService.applyAgain(orderRefundParam, ReturnMoneyStsType.SUCCESS.value());
                 orderRefundService.createRefundOrder(order.getOrderNumber(), orderRefund.getRefundSn());

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

@@ -33,6 +33,7 @@ import com.yami.shop.common.util.PageParam;
 import com.yami.shop.common.util.hb.HBR;
 import com.yami.shop.dao.*;
 import com.yami.shop.service.*;
+import com.yami.shop.service.hb.impl.HBOrderService;
 import com.yami.shop.utils.HBSignUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -1067,6 +1068,8 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             log.info("退款订单状态：{}", orderRefund.getReturnMoneySts());
             //TODO 退款单完成处理积分
             if (orderRefund.getReturnMoneySts().equals(70)) {
+                //推送商家审核状态后 同步退款单状态
+                changeStatus(orderRefund.getRefundSn(), orderRefund.getReturnMoneySts());
                 orderService.returnRefund(orderRefund.getOrderNumber());
             }
         } catch (Exception e) {

yami-shop-service/src/main/resources/mapper/PointsRechargeMapper.xml

@@ -13,6 +13,6 @@
               <if test="channelId != null"> channel_id = #{channelId}</if>
         </where>
         GROUP BY channel_id, channel_name
-        ORDER BY create_time DESC
+        ORDER BY max(create_time) DESC
     </select>
 </mapper>

yami-shop-wx/src/main/java/com/yami/shop/wx/service/impl/WxProviderServiceImpl.java

@@ -59,6 +59,8 @@ public class WxProviderServiceImpl implements WxProviderService {
     private static final String WX_SUCCESS_XML = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
 
     private static final String REFUND_URL = "https://shop.api.zswlgz.com/notice/pay/order/refundNotify";
+    // 测试环境
+//    private static final String REFUND_URL = "https://63332824.r36.cpolar.top/notice/pay/order/refundNotify";
 
     @Override
     public Map<String, Object> subJsapi(JsapiPayInfoPo po) {