merge

luodangjia

2024-11-04 e0fc8f7e2230b51e3bbe8dea43790cf11b7170e9

 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;
	
	
	
	
	
   /**
    * 远程管理后台取消订单后退款回调
    */
@@ -184,7 +191,7 @@
      // todo 根据支付方式 取消订单
      byId.setCancellationId(userid);
      byId.setCancellationTime(LocalDateTime.now());
      byId.setStatus(4);
      byId.setStatus(5);
      SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
      TShoppingOrderRefund tShoppingOrderRefund = new TShoppingOrderRefund();
      tShoppingOrderRefund.setPayTime(byId.getPayTime());
@@ -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();