|
|
@@ -95,11 +95,12 @@ public class WxPayOrderController extends BaseController { |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
String composeOrderType = paramMap.get("composeOrderType"); |
|
|
|
|
|
if (StringUtils.isBlank(composeOrderType)) { |
|
|
|
|
|
logger.info("composeOrderType不能为空: " + paramMap.toString()); |
|
|
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "composeOrderType不能为空"); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
String composeOrderType = "0"; |
|
|
|
|
|
// String composeOrderType = paramMap.get("composeOrderType"); |
|
|
|
|
|
// if (StringUtils.isBlank(composeOrderType)) { |
|
|
|
|
|
// logger.info("composeOrderType不能为空: " + paramMap.toString()); |
|
|
|
|
|
// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "composeOrderType不能为空"); |
|
|
|
|
|
// } |
|
|
|
|
|
|
|
|
WxCUser user = getWxCUser(); |
|
|
WxCUser user = getWxCUser(); |
|
|
if (!user.basicInfoIs()) { |
|
|
if (!user.basicInfoIs()) { |
|
|
|