diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java index fdab4f65b..dc320a020 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java @@ -115,23 +115,24 @@ public class WxCarController extends BaseController @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData quanTemplate(String merchantId, Integer pageNum, Integer pageSize) { - logger.info("quanTemplate: " + merchantId.toString()); + logger.info("quanTemplate: " + merchantId); MallUserInfo user = getUser(); /// 1, get mall's park WxPark park = getCurrentPark(user); + String params = park.getVendorParams(); + JSONObject objParams = JSON.parseObject(params); + String url = objParams.getString("url"); + String merchantNo = objParams.getString("merchantNo"); + String merchantKey = objParams.getString("merchantKey"); + String version = objParams.getString("version"); + String parkId = park.getParkId(); + if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { if (StringUtils.isBlank(merchantId)) { // 优先从从商户表里取 logger.error("quanTemplate failed, merchantId为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户为空"); } - String params = park.getVendorParams(); - JSONObject objParams = JSON.parseObject(params); - String url = objParams.getString("url"); - String merchantNo = objParams.getString("merchantNo"); - String merchantKey = objParams.getString("merchantKey"); - String version = objParams.getString("version"); - String parkId = park.getParkId(); // bussinessId from 参数信息 String businessId = ""; // 优先从从商户表里取