Browse Source

fix order

release_toaliyun_real
xiaohanzi 4 years ago
parent
commit
b0e8263313
2 changed files with 7 additions and 5 deletions
  1. +6
    -5
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java

+ 6
- 5
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java View File

@@ -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()) {


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java View File

@@ -22,6 +22,7 @@ public class WxComposeOrder {
private Object mainOrder;//真正的主订单对象 private Object mainOrder;//真正的主订单对象
//TODO 调试用,兼容以前的接口
private Long Id; private Long Id;
public Long getId() { public Long getId() {


Loading…
Cancel
Save