From 6bdfac6971a727e836eed90079cf8853e470019d Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sun, 12 Sep 2021 11:23:22 +0800 Subject: [PATCH] fix order --- .../db/migration/V202109070001__order.sql | 101 ++++++++++++++++++ .../controller/WxPayOrderController.java | 11 +- .../service/order/entity/WxComposeOrder.java | 8 -- 3 files changed, 106 insertions(+), 14 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202109070001__order.sql b/mallinkAdmin/src/main/resources/db/migration/V202109070001__order.sql index f28c0518f..2f1a458e7 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202109070001__order.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202109070001__order.sql @@ -922,4 +922,105 @@ update wx_order_97 set compose_order_id = 0 ,coupon_number=1; update wx_order_98 set compose_order_id = 0 ,coupon_number=1; update wx_order_99 set compose_order_id = 0 ,coupon_number=1; +update wx_pay_order_0 set compose_order = 0 ; +update wx_pay_order_1 set compose_order = 0 ; +update wx_pay_order_2 set compose_order = 0 ; +update wx_pay_order_3 set compose_order = 0 ; +update wx_pay_order_4 set compose_order = 0 ; +update wx_pay_order_5 set compose_order = 0 ; +update wx_pay_order_6 set compose_order = 0 ; +update wx_pay_order_7 set compose_order = 0 ; +update wx_pay_order_8 set compose_order = 0 ; +update wx_pay_order_9 set compose_order = 0 ; +update wx_pay_order_10 set compose_order = 0 ; +update wx_pay_order_11 set compose_order = 0 ; +update wx_pay_order_12 set compose_order = 0 ; +update wx_pay_order_13 set compose_order = 0 ; +update wx_pay_order_14 set compose_order = 0 ; +update wx_pay_order_15 set compose_order = 0 ; +update wx_pay_order_16 set compose_order = 0 ; +update wx_pay_order_17 set compose_order = 0 ; +update wx_pay_order_18 set compose_order = 0 ; +update wx_pay_order_19 set compose_order = 0 ; +update wx_pay_order_20 set compose_order = 0 ; +update wx_pay_order_21 set compose_order = 0 ; +update wx_pay_order_22 set compose_order = 0 ; +update wx_pay_order_23 set compose_order = 0 ; +update wx_pay_order_24 set compose_order = 0 ; +update wx_pay_order_25 set compose_order = 0 ; +update wx_pay_order_26 set compose_order = 0 ; +update wx_pay_order_27 set compose_order = 0 ; +update wx_pay_order_28 set compose_order = 0 ; +update wx_pay_order_29 set compose_order = 0 ; +update wx_pay_order_30 set compose_order = 0 ; +update wx_pay_order_31 set compose_order = 0 ; +update wx_pay_order_32 set compose_order = 0 ; +update wx_pay_order_33 set compose_order = 0 ; +update wx_pay_order_34 set compose_order = 0 ; +update wx_pay_order_35 set compose_order = 0 ; +update wx_pay_order_36 set compose_order = 0 ; +update wx_pay_order_37 set compose_order = 0 ; +update wx_pay_order_38 set compose_order = 0 ; +update wx_pay_order_39 set compose_order = 0 ; +update wx_pay_order_40 set compose_order = 0 ; +update wx_pay_order_41 set compose_order = 0 ; +update wx_pay_order_42 set compose_order = 0 ; +update wx_pay_order_43 set compose_order = 0 ; +update wx_pay_order_44 set compose_order = 0 ; +update wx_pay_order_45 set compose_order = 0 ; +update wx_pay_order_46 set compose_order = 0 ; +update wx_pay_order_47 set compose_order = 0 ; +update wx_pay_order_48 set compose_order = 0 ; +update wx_pay_order_49 set compose_order = 0 ; +update wx_pay_order_50 set compose_order = 0 ; +update wx_pay_order_51 set compose_order = 0 ; +update wx_pay_order_52 set compose_order = 0 ; +update wx_pay_order_53 set compose_order = 0 ; +update wx_pay_order_54 set compose_order = 0 ; +update wx_pay_order_55 set compose_order = 0 ; +update wx_pay_order_56 set compose_order = 0 ; +update wx_pay_order_57 set compose_order = 0 ; +update wx_pay_order_58 set compose_order = 0 ; +update wx_pay_order_59 set compose_order = 0 ; +update wx_pay_order_60 set compose_order = 0 ; +update wx_pay_order_61 set compose_order = 0 ; +update wx_pay_order_62 set compose_order = 0 ; +update wx_pay_order_63 set compose_order = 0 ; +update wx_pay_order_64 set compose_order = 0 ; +update wx_pay_order_65 set compose_order = 0 ; +update wx_pay_order_66 set compose_order = 0 ; +update wx_pay_order_67 set compose_order = 0 ; +update wx_pay_order_68 set compose_order = 0 ; +update wx_pay_order_69 set compose_order = 0 ; +update wx_pay_order_70 set compose_order = 0 ; +update wx_pay_order_71 set compose_order = 0 ; +update wx_pay_order_72 set compose_order = 0 ; +update wx_pay_order_73 set compose_order = 0 ; +update wx_pay_order_74 set compose_order = 0 ; +update wx_pay_order_75 set compose_order = 0 ; +update wx_pay_order_76 set compose_order = 0 ; +update wx_pay_order_77 set compose_order = 0 ; +update wx_pay_order_78 set compose_order = 0 ; +update wx_pay_order_79 set compose_order = 0 ; +update wx_pay_order_80 set compose_order = 0 ; +update wx_pay_order_81 set compose_order = 0 ; +update wx_pay_order_82 set compose_order = 0 ; +update wx_pay_order_83 set compose_order = 0 ; +update wx_pay_order_84 set compose_order = 0 ; +update wx_pay_order_85 set compose_order = 0 ; +update wx_pay_order_86 set compose_order = 0 ; +update wx_pay_order_87 set compose_order = 0 ; +update wx_pay_order_88 set compose_order = 0 ; +update wx_pay_order_89 set compose_order = 0 ; +update wx_pay_order_90 set compose_order = 0 ; +update wx_pay_order_91 set compose_order = 0 ; +update wx_pay_order_92 set compose_order = 0 ; +update wx_pay_order_93 set compose_order = 0 ; +update wx_pay_order_94 set compose_order = 0 ; +update wx_pay_order_95 set compose_order = 0 ; +update wx_pay_order_96 set compose_order = 0 ; +update wx_pay_order_97 set compose_order = 0 ; +update wx_pay_order_98 set compose_order = 0 ; +update wx_pay_order_99 set compose_order = 0 ; + diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index ed6edcd9e..a4d831d10 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -95,12 +95,11 @@ public class WxPayOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); } - 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不能为空"); -// } + 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 7af955bfd..f99a99d20 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,12 +22,4 @@ public class WxComposeOrder { private Object mainOrder;//真正的主订单对象 - //TODO 调试用,兼容以前的接口 - private Long Id; - - public Long getId() { - this.Id = this.mainOrderId; - return this.Id; - } - }