创建订单时支付状态为已完成支付

buyer-api/src/main/java/cn/lili/controller/order/CartController.java

@@ -252,8 +252,6 @@ public class CartController {
         try {
             //读取选中的列表
             Trade trade = this.cartService.createTrade(tradeParams);
-            // 自动完成支付
-            orderService.payOrder(trade.getSn(), PaymentMethodEnum.BANK_TRANSFER.paymentName(), "SYSTEM_AUTO_COMPLETE");
             return ResultUtil.data(trade);
         } catch (ServiceException se) {
             log.info(se.getMsg(), se);

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java

@@ -165,6 +165,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //构建orderVO对象
             OrderVO orderVO = new OrderVO();
             BeanUtil.copyProperties(order, orderVO);
+            // 订单默认刚开始为已付款状态
+            //修改订单状态
+            order.setPaymentTime(new Date());
+            order.setPaymentMethod(PaymentMethodEnum.BANK_TRANSFER.name());
+            order.setPayStatus(PayStatusEnum.PAID.name());
+            order.setOrderStatus(OrderStatusEnum.PAID.name());
+            order.setReceivableNo("SYSTEM_AUTO_COMPLETE");
+            order.setCanReturn(!PaymentMethodEnum.BANK_TRANSFER.name().equals(order.getPaymentMethod()));
             //持久化DO
             orders.add(order);
             String message = "订单[" + item.getSn() + "]创建";