Преглед изворни кода

fix bug

release_toaliyun_real
xiaohanzi пре 5 година
родитељ
комит
5de6ae5bb5
3 измењених фајлова са 5 додато и 3 уклоњено
  1. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java
  3. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java Прегледај датотеку

@@ -446,7 +446,7 @@ public class WxMicroPayController extends BaseController {
Integer remainPrice = payPrice; Integer remainPrice = payPrice;
if (wxCouponOrder != null) { if (wxCouponOrder != null) {
try { try {
couponPayOrder = wxCouponOrderService.microPayPreVerify(microOrder, wxCouponOrder, wxMerchantBUser, payPrice,payWay);
couponPayOrder = wxCouponOrderService.microPayPreVerify(microOrder, wxCouponOrder, wxMerchantBUser, payPrice,payWay,ipStr,authCode);
remainPrice = microOrder.getPayment() - couponPayOrder.getPayAmount(); remainPrice = microOrder.getPayment() - couponPayOrder.getPayAmount();
// 更新实际支付金额 // 更新实际支付金额
WxOrder updateOrder = new WxOrder(); WxOrder updateOrder = new WxOrder();


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java Прегледај датотеку

@@ -206,7 +206,7 @@ public interface WxCouponOrderService {
*/ */
JSONArray queryMicroPayCouponOrder(WxMerchantBUser user, WxCUserBasicInfo cUser, Integer price); JSONArray queryMicroPayCouponOrder(WxMerchantBUser user, WxCUserBasicInfo cUser, Integer price);


WxPayOrder microPayPreVerify(WxOrder microOrder, WxCouponOrder couponOrder, WxMerchantBUser bUser, Integer price, EnumPayWay payWay);
WxPayOrder microPayPreVerify(WxOrder microOrder, WxCouponOrder couponOrder, WxMerchantBUser bUser, Integer price, EnumPayWay payWay,String ipstr,String authCode);


Integer microPayVerify(WxMerchantBUser bUser, Long couponOrderId,EnumPayWay payWay); Integer microPayVerify(WxMerchantBUser bUser, Long couponOrderId,EnumPayWay payWay);




+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Прегледај датотеку

@@ -1244,7 +1244,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {


@Override @Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public WxPayOrder microPayPreVerify(WxOrder microOrder, WxCouponOrder couponOrder, WxMerchantBUser bUser, Integer payPrice, EnumPayWay payWay) {
public WxPayOrder microPayPreVerify(WxOrder microOrder, WxCouponOrder couponOrder, WxMerchantBUser bUser, Integer payPrice, EnumPayWay payWay,String ipstr,String authCode) {
// 1. 获取券信息 // 1. 获取券信息
WxCoupon wxCoupon = wxCouponMapper.selectById(couponOrder.getCouponId()); WxCoupon wxCoupon = wxCouponMapper.selectById(couponOrder.getCouponId());
if (wxCoupon == null) { if (wxCoupon == null) {
@@ -1368,6 +1368,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
setPayTimeStart(curDate); setPayTimeStart(curDate);
setPayTimeEnd(curDate); setPayTimeEnd(curDate);
setPayOrderNo(String.valueOf(payOrderId)); setPayOrderNo(String.valueOf(payOrderId));
setIp(ipstr);
setAuthCode(authCode);
if (microOrder.getPayment() > wxCoupon.getPrice()) { if (microOrder.getPayment() > wxCoupon.getPrice()) {
setPayAmount(wxCoupon.getPrice()); setPayAmount(wxCoupon.getPrice());
} else { } else {


Loading…
Откажи
Сачувај