From b0e8263313fcbe1bcb134e6108ac2cc4267164b8 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sun, 12 Sep 2021 11:00:54 +0800 Subject: [PATCH] fix order --- .../com/iformall/controller/WxPayOrderController.java | 11 ++++++----- .../iformall/service/order/entity/WxComposeOrder.java | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index a4d831d10..ed6edcd9e 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -95,11 +95,12 @@ public class WxPayOrderController extends BaseController { 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(); if (!user.basicInfoIs()) { diff --git a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java index 200078b97..7af955bfd 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java +++ b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java @@ -22,6 +22,7 @@ public class WxComposeOrder { private Object mainOrder;//真正的主订单对象 + //TODO 调试用,兼容以前的接口 private Long Id; public Long getId() {