caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加下单部分注视，支付宝h5支付日志记录内容

Browse Source
This commit is contained in:
Chopper 2021-06-16 15:54:54 +08:00
parent 00182f5cfb
commit 6205693df6
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,16 +121,21 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
@Override @Override
public void intoDB(TradeDTO tradeDTO) { public void intoDB(TradeDTO tradeDTO) {
//存放购物车，即业务中的订单
List<Order> orders = new ArrayList<>(tradeDTO.getCartList().size()); List<Order> orders = new ArrayList<>(tradeDTO.getCartList().size());
//存放自订单/订单日志
List<OrderItem> orderItems = new ArrayList<>(); List<OrderItem> orderItems = new ArrayList<>();
List<OrderLog> orderLogs = new ArrayList<>(); List<OrderLog> orderLogs = new ArrayList<>();
//拼团判定，不能参与自己创建的拼团
if (tradeDTO.getParentOrderSn() != null) { if (tradeDTO.getParentOrderSn() != null) {
Order parentOrder = this.getBySn(tradeDTO.getParentOrderSn()); Order parentOrder = this.getBySn(tradeDTO.getParentOrderSn());
if (parentOrder.getMemberId().equals(UserContext.getCurrentUser().getId())) { if (parentOrder.getMemberId().equals(UserContext.getCurrentUser().getId())) {
throw new ServiceException("不能参与自己发起的拼团活动！"); throw new ServiceException("不能参与自己发起的拼团活动！");
} }
} }
List<OrderVO> list = new ArrayList<>(); //订单集合
List<OrderVO> orderVOS = new ArrayList<>();
//循环购物车商品集合
tradeDTO.getCartList().forEach(item -> { tradeDTO.getCartList().forEach(item -> {
Order order = new Order(item, tradeDTO); Order order = new Order(item, tradeDTO);
if (OrderTypeEnum.PINTUAN.name().equals(order.getOrderType())) { if (OrderTypeEnum.PINTUAN.name().equals(order.getOrderType())) {
@ -150,9 +155,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
sku -> orderItems.add(new OrderItem(sku, item, tradeDTO)) sku -> orderItems.add(new OrderItem(sku, item, tradeDTO))
); );
orderVO.setOrderItems(orderItems); orderVO.setOrderItems(orderItems);
list.add(orderVO); orderVOS.add(orderVO);
}); });
tradeDTO.setOrderVO(list); tradeDTO.setOrderVO(orderVOS);
//批量保存订单 //批量保存订单
this.saveBatch(orders); this.saveBatch(orders);
//批量保存 子订单 //批量保存 子订单

5
framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java
View File

@ -13,6 +13,7 @@ import com.alipay.api.request.AlipayTradePrecreateRequest;
import com.alipay.api.request.AlipayTradeWapPayRequest; import com.alipay.api.request.AlipayTradeWapPayRequest;
import com.alipay.api.response.AlipayTradeAppPayResponse; import com.alipay.api.response.AlipayTradeAppPayResponse;
import com.alipay.api.response.AlipayTradePrecreateResponse; import com.alipay.api.response.AlipayTradePrecreateResponse;
import lombok.extern.slf4j.Slf4j;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
@ -24,7 +25,7 @@ import java.io.PrintWriter;
* @author Chopper * @author Chopper
* @date 2020/12/15 19:26 * @date 2020/12/15 19:26
*/ */
@Slf4j
public class AliPayRequest { 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 { public static void wapPay(HttpServletResponse response, AlipayTradeWapPayModel model, String returnUrl, String notifyUrl) throws AlipayApiException, IOException {
String form = wapPayStr(model, returnUrl, notifyUrl); String form = wapPayStr(model, returnUrl, notifyUrl);
response.setContentType("text/html;charset=UTF-8"); response.setContentType("text/html;charset=UTF-8");
log.info("支付表单{}", form);
PrintWriter out = response.getWriter(); PrintWriter out = response.getWriter();
out.write(form); out.write(form);
out.flush(); out.flush();