|
@@ -108,7 +108,7 @@ public class WxPayController {
|
|
|
@ApiOperation(value = "统一下单,并组装所需支付参数")
|
|
|
@PostMapping("/createOrder")
|
|
|
public AjaxResult createOrder(@RequestBody WxPayDto dto) throws WxPayException {
|
|
|
- log.info("开始下单:{}", dto.toString());
|
|
|
+ log.info("开始下单:{}", dto);
|
|
|
WxPayUnifiedOrderV3Request request = new WxPayUnifiedOrderV3Request();
|
|
|
request.setDescription("购买会员");
|
|
|
// 商品订单号
|
|
@@ -117,7 +117,7 @@ public class WxPayController {
|
|
|
// 订单金额
|
|
|
WxPayUnifiedOrderV3Request.Amount amount = new WxPayUnifiedOrderV3Request.Amount();
|
|
|
amount.setCurrency("CNY");
|
|
|
- BigDecimal total = new BigDecimal("0");
|
|
|
+ BigDecimal total = new BigDecimal(dto.gettBal());
|
|
|
if (StringUtils.isNotEmpty(dto.getMoney())) {
|
|
|
total = total.subtract(new BigDecimal(dto.getMoney()));
|
|
|
} else if (StringUtils.isNotEmpty(dto.getDiscount())) {
|
|
@@ -126,6 +126,9 @@ public class WxPayController {
|
|
|
log.info("用户:{},支付总金额为:{}, 订单Id为:{}", dto.getOpenId(), amount, orderNo);
|
|
|
amount.setTotal(total.intValue() * 100);
|
|
|
request.setAmount(amount);
|
|
|
+ WxPayUnifiedOrderV3Request.Payer payer = new WxPayUnifiedOrderV3Request.Payer();
|
|
|
+ payer.setOpenid(dto.getOpenId());
|
|
|
+ request.setPayer(payer);
|
|
|
WxPayUnifiedOrderV3Result.JsapiResult orderV3 = this.wxPayService.createOrderV3(TradeTypeEnum.JSAPI, request);
|
|
|
AjaxResult result = new AjaxResult();
|
|
|
result.put("appId", orderV3.getAppId());
|