zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
Cauchy
2023-10-18 17:16:45 +08:00
parent f1b072d6c3 8f7f785ba9
commit 19a2ef58a9
32 changed files with 216 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/peanut/modules/pay/IOSPay/service/impl/OrderServiceImpl.java
View File

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.peanut.common.utils.ExcludeEmptyQueryWrapper;
import com.peanut.common.utils.PageUtils;
import com.peanut.common.utils.Query;
import com.peanut.modules.app.service.UserService;
import com.peanut.modules.book.entity.BookBuyConfigEntity;
import com.peanut.modules.book.entity.BuyOrder;
import com.peanut.modules.book.entity.MyUserEntity;
@@ -37,7 +36,7 @@ public class OrderServiceImpl extends ServiceImpl<PayIOSOrderMapper,IosPayOrderE
@Autowired
private BuyOrderService buyOrderService;
@Autowired
private UserService userService;
private MyUserService userService;
@Autowired
private MyUserService myUserService;

7
src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
View File

@@ -58,6 +58,11 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
log.info("请求参数:{}", paramMap);
JSONObject responseJson = wxPayUtil.doPostWexinV3(wechatPayConfig.getPayUrl(), json.toJSONString());
String prepayId = responseJson.getString("prepay_id");
payWechatOrderService.add(paymentInfo.getOrderSn(), prepayId);
if (paymentInfo.getBuyOrderId() == null) {
payWechatOrderService.add(paymentInfo.getOrderSn(), prepayId);
} else {
payWechatOrderService.addForPoint(paymentInfo.getOrderSn(), prepayId, paymentInfo.getBuyOrderId());
}
}
}