|
|
@@ -449,6 +449,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
|
|
|
orderDon.setStatus(OrderDon.Status.noPayment);
|
|
|
orderDon.setUserId(user.getId());
|
|
|
+ orderDon.setGoodsId(goodsDon.getId());
|
|
|
this.saveOrUpdate(orderDon);
|
|
|
|
|
|
jobManager.addJob(EXPIRY_TIME, () -> {
|
|
|
@@ -616,7 +617,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
String body = Codec.DoBase64.custom()
|
|
|
.setData(Jsons.toJson(attach)).encodeAsText();
|
|
|
OrderDon orderDon = orderDonMapper.selectById(orderId);
|
|
|
- GoodsDon goodsDon = goodsDonMapper.selectById(orderDon.getGoodsId());
|
|
|
+ GoodsDonSku goodsDonSku = goodsDonSkuMapper.selectById(orderDon.getSkuId());
|
|
|
+ GoodsDon goodsDon = goodsDonMapper.selectById(goodsDonSku.getGoodsId());
|
|
|
if (ZfbProductCode.MOBILE_WEB.getProductCode().equals(productCode)) {
|
|
|
//手机网站支付
|
|
|
AlipayTradeWapPayRequest alipayTradeWapPayRequest = new AlipayTradeWapPayRequest();
|