Просмотр исходного кода

fix car pay

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
8a62700b25
4 измененных файлов: 6 добавлений и 7 удалений
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
  3. +1
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java

+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Просмотреть файл

@@ -285,7 +285,8 @@ public class WxMerchantController extends BaseController {
@ApiOperation("(微信)商户手填收款账号")
@PostMapping("setMerchantAccount")
public ResultData setMerchantAccount(@RequestBody WxMerchant wxMerchant) {
if (null == wxMerchant.getId() || StringUtils.isBlank(wxMerchant.getAccount()) || null == wxMerchant.getIsIsv()) {
if (null == wxMerchant.getId() || StringUtils.isBlank(wxMerchant.getAccount())
|| null == wxMerchant.getIsIsv() || null == wxMerchant.getApiKey()) {
return new ResultData(ResultData.ERROR,"参数缺失");
}
wxMerchant.updateTenantInfo(getTenantInfo());


+ 2
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java Просмотреть файл

@@ -516,6 +516,8 @@ public class WxCarController extends BaseController {
//String productPre = "ParkOrderId";
PayAdapterResult wxResult = wxParkPayService.createWxPayOrder(park,isIsv,false,user.getOpenId(), user.getAppId(), receiver.getReceiverAccount(), productPre+payOrder.getParkOrderNumber(), attach, uniquePayOrderNo, payOrder.getFee(),
"127.0.0.1", park.getPaidCallBack(), apiKey, new Date());
logger.info(">>>>> wxResult "+ JSON.toJSONString(wxResult));
return new ResultData(wxResult);
} catch (Exception e) {
logger.error("park createPayOrder error",e);


+ 1
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Просмотреть файл

@@ -946,11 +946,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
receiver.setPlat(EnumAppPlat.WX.getCode());
}
StringBuffer psb = new StringBuffer("{\"").append(Constant.paymentReceiverParamIsv).append("\":").append(wxMerchant.getIsIsv()).append("");
if (EnumYesOrNo.YES.getCode() == wxMerchant.getIsIsv()) {
psb.append("}");
}else {
psb.append(",\"").append(Constant.paymentReceicerParamApiKey).append("\":\"").append(wxMerchant.getApiKey()).append("\"}");
}
psb.append(",\"").append(Constant.paymentReceicerParamApiKey).append("\":\"").append(wxMerchant.getApiKey()).append("\"}");
receiver.setReceiverAccount(wxMerchant.getAccount());
receiver.setReceiverParams(psb.toString());
wxProfitPaymentReceiverService.saveOrUpdate(receiver);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java Просмотреть файл

@@ -112,7 +112,7 @@ public class WxMiniAppPayAdapterService extends BaseWxPayV2AdapterService implem
// update payOrder with prepay_id
record.setPrepayId(prepay_id);
record.setUpdateTime(new Date());
record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
//record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
}
String timestamp = String.valueOf(Utility.getCurrentTimeStamp());


Загрузка…
Отмена
Сохранить