| @@ -285,7 +285,8 @@ public class WxMerchantController extends BaseController { | |||||
| @ApiOperation("(微信)商户手填收款账号") | @ApiOperation("(微信)商户手填收款账号") | ||||
| @PostMapping("setMerchantAccount") | @PostMapping("setMerchantAccount") | ||||
| public ResultData setMerchantAccount(@RequestBody WxMerchant wxMerchant) { | 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,"参数缺失"); | return new ResultData(ResultData.ERROR,"参数缺失"); | ||||
| } | } | ||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | wxMerchant.updateTenantInfo(getTenantInfo()); | ||||
| @@ -516,6 +516,8 @@ public class WxCarController extends BaseController { | |||||
| //String productPre = "ParkOrderId"; | //String productPre = "ParkOrderId"; | ||||
| PayAdapterResult wxResult = wxParkPayService.createWxPayOrder(park,isIsv,false,user.getOpenId(), user.getAppId(), receiver.getReceiverAccount(), productPre+payOrder.getParkOrderNumber(), attach, uniquePayOrderNo, payOrder.getFee(), | 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()); | "127.0.0.1", park.getPaidCallBack(), apiKey, new Date()); | ||||
| logger.info(">>>>> wxResult "+ JSON.toJSONString(wxResult)); | |||||
| return new ResultData(wxResult); | return new ResultData(wxResult); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("park createPayOrder error",e); | logger.error("park createPayOrder error",e); | ||||
| @@ -946,11 +946,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| receiver.setPlat(EnumAppPlat.WX.getCode()); | receiver.setPlat(EnumAppPlat.WX.getCode()); | ||||
| } | } | ||||
| StringBuffer psb = new StringBuffer("{\"").append(Constant.paymentReceiverParamIsv).append("\":").append(wxMerchant.getIsIsv()).append(""); | 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.setReceiverAccount(wxMerchant.getAccount()); | ||||
| receiver.setReceiverParams(psb.toString()); | receiver.setReceiverParams(psb.toString()); | ||||
| wxProfitPaymentReceiverService.saveOrUpdate(receiver); | wxProfitPaymentReceiverService.saveOrUpdate(receiver); | ||||
| @@ -112,7 +112,7 @@ public class WxMiniAppPayAdapterService extends BaseWxPayV2AdapterService implem | |||||
| // update payOrder with prepay_id | // update payOrder with prepay_id | ||||
| record.setPrepayId(prepay_id); | record.setPrepayId(prepay_id); | ||||
| record.setUpdateTime(new Date()); | record.setUpdateTime(new Date()); | ||||
| record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | |||||
| //record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | |||||
| } | } | ||||
| String timestamp = String.valueOf(Utility.getCurrentTimeStamp()); | String timestamp = String.valueOf(Utility.getCurrentTimeStamp()); | ||||