支付优化

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/dubbo/RemoteOrderServiceImpl.java

@@ -149,12 +149,9 @@ public class RemoteOrderServiceImpl implements RemoteOrderService {
         //跟新支付信息
         order.setAmount(ot.getAmount());
         order.setPayAmount(ot.getPayAmount());
-        order.setActualPayAmount(ot.getActualPayAmount());
         order.setDiscountAmount(ot.getDiscountAmount());
         orderService.updateByBo(BeanUtil.copyProperties(order, OrderBo.class));
 
-        //获取支付订单
-
         return new OrderPay()
             .setOrderNo(order.getOriginOrderNo())
             .setOrderPayNo(ot.getOrderPayNo())

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/WeChatOrderPayServiceImpl.java

@@ -121,12 +121,12 @@ public class WeChatOrderPayServiceImpl implements IOrderPayService {
                 OrderVo order = orderService.getOne(new OrderBo().setOrderNo(orderTrade.getOrderNo()));
                 order.setOrderPayNo(orderPayNo);
                 order.setActualPayAmount(orderTrade.getActualPayAmount());
-                order.setPayTime(new Date());
+                order.setPayTime(payTime);
                 order.setStatus(OrderStatus.PAYED.getCode());
                 orderService.updateByBo(BeanUtil.copyProperties(order, OrderBo.class));
 
                 //跟新云上相关信息
-                ysOrderService.payed(order.getOrderType(), order.getOrderNo());
+                ysOrderService.payed(order.getOrderType(), order.getOriginOrderNo());
             }
 
         }