diff --git a/mallinkAdmin/src/main/resources/db/migration/V202106170001__couponOrder.sql b/mallinkAdmin/src/main/resources/db/migration/V202106170001__couponOrder.sql new file mode 100644 index 000000000..fbd7b158a --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V202106170001__couponOrder.sql @@ -0,0 +1,203 @@ +ALTER TABLE wx_coupon_order_0 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_1 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_2 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_3 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_4 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_5 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_6 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_7 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_8 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_9 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_10 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_11 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_12 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_13 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_14 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_15 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_16 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_17 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_18 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_19 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_20 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_21 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_22 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_23 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_24 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_25 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_26 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_27 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_28 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_29 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_30 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_31 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_32 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_33 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_34 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_35 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_36 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_37 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_38 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_39 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_40 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_41 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_42 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_43 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_44 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_45 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_46 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_47 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_48 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_49 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_50 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_51 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_52 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_53 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_54 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_55 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_56 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_57 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_58 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_59 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_60 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_61 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_62 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_63 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_64 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_65 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_66 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_67 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_68 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_69 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_70 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_71 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_72 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_73 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_74 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_75 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_76 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_77 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_78 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_79 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_80 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_81 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_82 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_83 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_84 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_85 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_86 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_87 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_88 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_89 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_90 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_91 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_92 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_93 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_94 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_95 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_96 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_97 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_98 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_99 ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; +ALTER TABLE wx_coupon_order_ ADD COLUMN send_merchant_id BIGINT(20) COMMENT '赠券商户编号'; + +alter table wx_coupon_order_0 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_1 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_2 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_3 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_4 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_5 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_6 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_7 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_8 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_9 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_10 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_11 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_12 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_13 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_14 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_15 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_16 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_17 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_18 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_19 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_20 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_21 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_22 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_23 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_24 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_25 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_26 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_27 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_28 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_29 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_30 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_31 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_32 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_33 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_34 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_35 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_36 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_37 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_38 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_39 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_40 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_41 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_42 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_43 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_44 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_45 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_46 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_47 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_48 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_49 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_50 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_51 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_52 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_53 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_54 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_55 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_56 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_57 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_58 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_59 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_60 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_61 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_62 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_63 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_64 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_65 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_66 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_67 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_68 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_69 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_70 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_71 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_72 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_73 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_74 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_75 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_76 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_77 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_78 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_79 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_80 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_81 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_82 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_83 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_84 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_85 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_86 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_87 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_88 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_89 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_90 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_91 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_92 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_93 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_94 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_95 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_96 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_97 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_98 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_99 add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; +alter table wx_coupon_order_ add column send_merchant_user_id bigint(20) COMMENT '赠券商户员工编号'; \ No newline at end of file diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java index 7c55e864b..49b28174a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -102,7 +102,7 @@ public class WxCouponSendController extends BaseController { wxCouponSend.setSendType(EnumCouponSendSendType.MERCHANT.getCode()); wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); try { - wxCouponSendService.handSel(wxCouponSend, Long.parseLong(cUserId),EnumPayWay.PAY_WAY_NOT_UNPAY_MERCHANT,getLoginBUser().getId()); + wxCouponSendService.handSel(wxCouponSend, Long.parseLong(cUserId),EnumPayWay.PAY_WAY_NOT_UNPAY_MERCHANT,getLoginBUser().getMerchantId(),getLoginBUser().getId()); } catch (MallinkException e) { logger.error("注券异常: ", e); return new ResultData(e.getErrorCode(), e.getMessage()); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java index ced1d89dc..1e9c7480f 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java @@ -191,7 +191,7 @@ public class CouponSendSchedule { // 发放免费券 try { - WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cu.getId(), cs,cs.getCouponId(), null,EnumPayWay.PAY_WAY_NOT_UNPAY_SYSTEM_SEND); + WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cu.getId(), cs,cs.getCouponId(), null,EnumPayWay.PAY_WAY_NOT_UNPAY_SYSTEM_SEND,null,null); wxCouponActionLogService.addOne(tenantEntity, cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId(),0L); } catch (Exception e) { logger.error("定时发券:发券失败 levelId=" + l.getId() + " couponId=" + cs.getCouponId() + " userId=" + cu.getId() + e.getMessage()); @@ -321,7 +321,7 @@ public class CouponSendSchedule { for (WxCUserBasicInfo cu : newUserList) { // 发放生日券 try { - WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cu.getId(),cs, cs.getCouponId(), null,EnumPayWay.PAY_WAY_NOT_UNPAY_SYSTEM_SEND); + WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cu.getId(),cs, cs.getCouponId(), null,EnumPayWay.PAY_WAY_NOT_UNPAY_SYSTEM_SEND,null,null); wxCouponActionLogService.addOne(tenantEntity, cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId(), 0L); couponSendedUsers.add(cu); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java index 70118f9b9..3219d9c08 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java @@ -49,6 +49,10 @@ public class WxCouponOrder extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="核销类型(0:B端核销, 1:POS独立核销 2:POS交易核销)",name="verifyType") private Integer verifyType; + @io.swagger.annotations.ApiModelProperty(value="赠券商户编号",name="sendMerchantId") + private Long sendMerchantId; + @io.swagger.annotations.ApiModelProperty(value="赠券商户员工编号",name="sendMerchantUserId") + private Long sendMerchantUserId; @TableField(exist = false) private String couponName; diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java index a5ca39b7d..aef2a0de9 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java @@ -96,7 +96,7 @@ public interface WxCouponSendService { * * @param wxCouponSend */ - void handSel(WxCouponSend wxCouponSend,Long cUserId,EnumPayWay payWay,Long bUserId) ; + void handSel(WxCouponSend wxCouponSend,Long cUserId,EnumPayWay payWay,Long merchantId,Long bUserId) ; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java index c4f281455..4c770ebd4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java @@ -86,7 +86,7 @@ public interface WxOrderService { * @param wxCouponSendVo 商户注券时必须指定 * @return WxCouponOrder */ - WxCouponOrder sendFreeCouponToUser(Long userId,TenantEntity tenantinfo,Long couponId, WxCouponSendVo wxCouponSendVo,EnumPayWay payWay); + WxCouponOrder sendFreeCouponToUser(Long userId,TenantEntity tenantinfo,Long couponId, WxCouponSendVo wxCouponSendVo,EnumPayWay payWay,Long merchantId,Long bUserId); /** * orderSuccess 订单已支付 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java index 2d6a32936..934046a57 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java @@ -274,7 +274,7 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { // 发放免费券 WxCouponOrder couponOrder = null; try { - couponOrder = wxOrderService.sendFreeCouponToUser(tempCUser.getId(),wxCoupon, wxCoupon.getId(),null,EnumPayWay.PAY_WAY_NOT_UNPAY_BATCH_SEND); + couponOrder = wxOrderService.sendFreeCouponToUser(tempCUser.getId(),wxCoupon, wxCoupon.getId(),null,EnumPayWay.PAY_WAY_NOT_UNPAY_BATCH_SEND,null,null); if (couponOrder != null) { wxCouponActionLogService.addOne(couponOrder, wxCoupon.getId(), couponOrder.getId(), EnumCouponSendSendType.INJECT.getCode(), couponInjectId,0L); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index fdd53bd69..b341c1d30 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -396,7 +396,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { // 发放免费券 WxCouponOrder couponOrder = null; try { - couponOrder = wxOrderService.sendFreeCouponToUser(cUserId,send, send.getCouponId(), null,payWay); + couponOrder = wxOrderService.sendFreeCouponToUser(cUserId,send, send.getCouponId(), null,payWay,null,null); if (couponOrder != null) { bRet = true; @@ -653,7 +653,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public void handSel(WxCouponSend wxCouponSend, Long cUserId,EnumPayWay payWay,Long bUserId) { + public void handSel(WxCouponSend wxCouponSend, Long cUserId,EnumPayWay payWay,Long merchantId,Long bUserId) { WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(cUserId,wxCouponSend.getFinalTenantId()); if (Objects.isNull(wxCUserBasicInfo)) { @@ -666,7 +666,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { } couponSendList.forEach(cs -> { // 发放免费券 - WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cUserId,cs, cs.getCouponId(), cs,payWay); + WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cUserId,cs, cs.getCouponId(), cs,payWay,merchantId,bUserId); if (couponOrder != null) { wxCouponActionLogService.addOne(couponOrder, cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId(),bUserId); sendMsgForSendCoupon(couponOrder, cs, couponOrder, wxCUserBasicInfo); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 231e9a758..d34c973c8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -963,7 +963,7 @@ public class WxOrderServiceImpl implements WxOrderService { * @param order * @param coupon */ - private WxCouponOrder createCouponOrder(WxOrder order, WxCUserBasicInfo user, WxCoupon coupon, Long couponPasswordId,EnumPayWay payWay) { + private WxCouponOrder createCouponOrder(WxOrder order, WxCUserBasicInfo user, WxCoupon coupon, Long couponPasswordId,EnumPayWay payWay,Long merchantId,Long bUserId) { Date curr = new Date(); Date valid_date = null; int limit_days = Constant.WX_LIMIT_DAYS; @@ -1044,6 +1044,12 @@ public class WxOrderServiceImpl implements WxOrderService { couponOrder.setAutoRefund(coupon.getAutoRefund()); couponOrder.setOrderId(order.getOrderNumber()); couponOrder.setExpiredTime(valid_date); + if (null != merchantId) { + couponOrder.setSendMerchantId(merchantId); + } + if (null != bUserId) { + couponOrder.setSendMerchantUserId(bUserId); + } //有支付信息,从支付信息中取渠道 if (null != payOrder) { couponOrder.setPayVendor(payOrder.getPayVendor()); @@ -1221,7 +1227,7 @@ public class WxOrderServiceImpl implements WxOrderService { @Override @Transactional(propagation = Propagation.NESTED, readOnly = false, rollbackFor = {Exception.class}) - public WxCouponOrder sendFreeCouponToUser(Long userId,TenantEntity tenantinfo, Long couponId, WxCouponSendVo wxCouponSendVo,EnumPayWay payWay) { + public WxCouponOrder sendFreeCouponToUser(Long userId,TenantEntity tenantinfo, Long couponId, WxCouponSendVo wxCouponSendVo,EnumPayWay payWay,Long merchantId,Long bUserId) { // check 用户状态 WxCUserBasicInfo user = null; try { @@ -1302,7 +1308,7 @@ public class WxOrderServiceImpl implements WxOrderService { // 创建couponOrder WxCouponOrder couponOrder = null; try { - couponOrder = createCouponOrder(record, user, coupon, null,payWay); + couponOrder = createCouponOrder(record, user, coupon, null,payWay,merchantId,bUserId); } catch (Exception e) { logger.error("保存订单:" + e.getMessage()); throw new MallinkException(ErrorCode.COUPON_ORDER_SAVE_ERR.getCode(), coupon.getTitle() + ErrorCode.COUPON_ORDER_SAVE_ERR.getMessage()); @@ -1350,7 +1356,7 @@ public class WxOrderServiceImpl implements WxOrderService { // 创建couponOrder try { - createCouponOrder(updateOrder, user, coupon, null,null); + createCouponOrder(updateOrder, user, coupon, null,null,null,null); } catch (Exception e) { logger.error("创建券包:" + e.getMessage()); throw new MallinkException(ErrorCode.COUPON_ORDER_SAVE_ERR); @@ -2038,7 +2044,7 @@ public class WxOrderServiceImpl implements WxOrderService { // 5. 创建couponOrder try { - createCouponOrder(record, user, coupon, couponPasswordId,payWay); + createCouponOrder(record, user, coupon, couponPasswordId,payWay,null,null); } catch (Exception e) { logger.error("couponOrder失败:" + e.getMessage(),e); throw new MallinkException(ErrorCode.COUPON_ORDER_SAVE_ERR); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 2c51bb200..f04b4aecf 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -19,10 +19,12 @@ + + - `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`, `verify_type`,`pay_vendor` + `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`, `verify_type`,`pay_vendor`,`send_merchant_id`,`send_merchant_user_id` @@ -90,6 +92,14 @@ and `pay_vendor` = #{payVendor} + + + and `send_merchant_id` = #{sendMerchantId} + + + + and `send_merchant_user_id` = #{sendMerchantUserId} + and id in