diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java index c7178617..f8ebe134 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java @@ -121,16 +121,21 @@ public class OrderServiceImpl extends ServiceImpl implements @Override public void intoDB(TradeDTO tradeDTO) { + //存放购物车,即业务中的订单 List orders = new ArrayList<>(tradeDTO.getCartList().size()); + //存放自订单/订单日志 List orderItems = new ArrayList<>(); List orderLogs = new ArrayList<>(); + //拼团判定,不能参与自己创建的拼团 if (tradeDTO.getParentOrderSn() != null) { Order parentOrder = this.getBySn(tradeDTO.getParentOrderSn()); if (parentOrder.getMemberId().equals(UserContext.getCurrentUser().getId())) { throw new ServiceException("不能参与自己发起的拼团活动!"); } } - List list = new ArrayList<>(); + //订单集合 + List orderVOS = new ArrayList<>(); + //循环购物车商品集合 tradeDTO.getCartList().forEach(item -> { Order order = new Order(item, tradeDTO); if (OrderTypeEnum.PINTUAN.name().equals(order.getOrderType())) { @@ -150,9 +155,9 @@ public class OrderServiceImpl extends ServiceImpl implements sku -> orderItems.add(new OrderItem(sku, item, tradeDTO)) ); orderVO.setOrderItems(orderItems); - list.add(orderVO); + orderVOS.add(orderVO); }); - tradeDTO.setOrderVO(list); + tradeDTO.setOrderVO(orderVOS); //批量保存订单 this.saveBatch(orders); //批量保存 子订单 diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java index ceb0d134..f721a281 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java @@ -13,6 +13,7 @@ import com.alipay.api.request.AlipayTradePrecreateRequest; import com.alipay.api.request.AlipayTradeWapPayRequest; import com.alipay.api.response.AlipayTradeAppPayResponse; import com.alipay.api.response.AlipayTradePrecreateResponse; +import lombok.extern.slf4j.Slf4j; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -24,7 +25,7 @@ import java.io.PrintWriter; * @author Chopper * @date 2020/12/15 19:26 */ - +@Slf4j public class AliPayRequest { /** @@ -40,7 +41,7 @@ public class AliPayRequest { public static void wapPay(HttpServletResponse response, AlipayTradeWapPayModel model, String returnUrl, String notifyUrl) throws AlipayApiException, IOException { String form = wapPayStr(model, returnUrl, notifyUrl); response.setContentType("text/html;charset=UTF-8"); - + log.info("支付表单{}", form); PrintWriter out = response.getWriter(); out.write(form); out.flush();