diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index b967a889a..bcc843fba 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -392,7 +392,7 @@ public class WxCarController extends BaseController { } return new ResultData(Result.ERROR,"已经使用过优惠券, 不能重复使用."); } else { - WxCoupon coupon = couponService.getById(userCar.getCouponId(),park.getFinalTenantId()); + WxCoupon coupon = couponService.getById(userCar.getCouponId(),park.getTenantId()); if (coupon == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "券为空"); } diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java b/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java index eeea7bec7..ef3c1343f 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java +++ b/mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java @@ -290,9 +290,51 @@ public class DouYinPayHelper { Integer code = jsonObject.getInteger("err_no"); if (null != code && code.intValue() == 0 ) { QueryMerchantResult result = new QueryMerchantResult(); - result.setWx(jsonObject.getInteger("wx")); - result.setAlipay(jsonObject.getInteger("alipay")); - result.setHz(jsonObject.getInteger("hz")); + Integer yzt = jsonObject.getInteger("yzt"); + if(yzt != null && yzt == 1){ + Integer wx = 0,alipay = 0,hz = 0; + JSONObject statusInfo = jsonObject.getJSONObject("pay_status_info"); + if(statusInfo != null){ + JSONObject wxObject = statusInfo.getJSONObject("wx"); + if(wxObject != null){ + String wxStatus = wxObject.getString("status"); + if(StringUtils.isNotBlank(wxStatus) && "SUCCESS".equals(wxStatus)){ + wx = 1; + }else if(StringUtils.isNotBlank(wxStatus) && "FAIL".equals(wxStatus)){ + wx = 2; + } + } + + JSONObject alipayObject = statusInfo.getJSONObject("alipay"); + if(alipayObject != null){ + String aliStatus = alipayObject.getString("status"); + if(StringUtils.isNotBlank(aliStatus) && "SUCCESS".equals(aliStatus)){ + alipay = 1; + }else if(StringUtils.isNotBlank(aliStatus) && "FAIL".equals(aliStatus)){ + alipay = 2; + } + } + + JSONObject hzObject = statusInfo.getJSONObject("hz"); + if(hzObject != null){ + String hzStatus = hzObject.getString("status"); + if(StringUtils.isNotBlank(hzStatus) && "SUCCESS".equals(hzStatus)){ + hz = 1; + }else if(StringUtils.isNotBlank(hzStatus) && "FAIL".equals(hzStatus)){ + hz = 2; + } + } + } + + result.setWx(wx); + result.setAlipay(alipay); + result.setHz(hz); + + }else{ + result.setWx(jsonObject.getInteger("wx")); + result.setAlipay(jsonObject.getInteger("alipay")); + result.setHz(jsonObject.getInteger("hz")); + } return result; }else { log.error("queryMerchantStatus reponse error. request: "+JSON.toJSONString(map)+" response:"+response); diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java index b2ea6e5dd..e55751710 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java @@ -137,7 +137,7 @@ public class TtServiceFeeService implements ServiceFeeAdapterService{ int sellerAmount = PayUtils.getPayRate(wxComposeChildOrderShare.getRealPayMent(), sellCommission, false); wxComposeChildOrderShare.setSellerAmount(sellerAmount); //系统 先计算销售+系统 然后再减去销售 - int systemCommission = getSystemCommission(null, payAccount); + int systemCommission = getSystemCommissionByOrder(wxComposeChildOrderShare.getOrderId(), payAccount); int selSysAmount = PayUtils.getPayRate(wxComposeChildOrderShare.getRealPayMent(), systemCommission+sellCommission, false); int systemAmount = selSysAmount - sellerAmount; wxComposeChildOrderShare.setSystemAmount(systemAmount);