Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-31 fd35f223b7f40ee9ee4a9307384b54a96d7956a2

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java

@@ -82,6 +82,13 @@
   private SysUserClient sysUserClient;
   @Resource
   private TShoppingOrderRefundService shoppingOrderRefundService;
   @Resource
   private AppUserAddressClient appUserAddressClient;
	
	
	
	
	
   /**
    * 远程管理后台取消订单后退款回调
    */
@@ -350,8 +357,7 @@
      return AjaxResult.success(list);
   }

   @Resource
   private AppUserAddressClient appUserAddressClient;
	
   @PostMapping("/create")
   public R<TShoppingOrder> shopCreate(@RequestBody ExchangeDto exchangeDto) {
      TShoppingOrder shoppingOrder = new TShoppingOrder();