|
|
@@ -333,13 +333,14 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
/* 生成订单 */
|
|
|
String donNo = SEQUENCE.nextId().toString();
|
|
|
orderMasterDon.setOrderNo(donNo);
|
|
|
- orderMasterDon.setOpenId(user.getOpenId());
|
|
|
+ orderMasterDon.setOpenId(payOpenId);
|
|
|
orderMasterDon.setYhsId(yhsId);
|
|
|
orderMasterDon.setType(OrderMasterDon.Type.ALI_PAY);
|
|
|
orderMasterDon.setUserId(user.getId());
|
|
|
|
|
|
OrderDon orderDon = new OrderDon();
|
|
|
orderDon.setIsDp(false);
|
|
|
+ orderDon.setOpenId(payOpenId);
|
|
|
if (isNoLogin != null && isNoLogin) {
|
|
|
orderDon.setIsNoLogin(true);
|
|
|
}
|
|
|
@@ -1371,6 +1372,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
orderMasterDon.setPayTitle(payTitle.toString());
|
|
|
|
|
|
OrderDon orderDon = new OrderDon();
|
|
|
+ orderDon.setOpenId(user.getOpenId());
|
|
|
orderDon.setYhsId(yhsId);
|
|
|
orderDon.setMoney(sku.getPrice().multiply(BigDecimal.valueOf(payRequest.getNum())));
|
|
|
orderDon.setSkuId(renewSkuId);
|