Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-04 bfc4eee4dad838e96059c9e0c2f5e01722ab7284

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

@@ -191,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());