diff --git a/mallinkAdmin/src/main/resources/db/migration/V201910171004__G_ALTER_MERCHANT_SUBSIDY.sql b/mallinkAdmin/src/main/resources/db/migration/V201910171004__G_ALTER_MERCHANT_SUBSIDY.sql new file mode 100644 index 000000000..0dcda37f1 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201910171004__G_ALTER_MERCHANT_SUBSIDY.sql @@ -0,0 +1,2 @@ +alter table wx_merchant_subsidy modify column type tinyint(2) not null default 1 comment '结算类型1微信结算2自主结算'; +alter table wx_merchant_subsidy add column source tinyint(2) not null default 0 comment '结算来源1卡消费2券核销3砍价核销4拼团核销5收银分账'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201910171127__G_ALTER_MERCHANT_SUBSIDY.sql b/mallinkAdmin/src/main/resources/db/migration/V201910171127__G_ALTER_MERCHANT_SUBSIDY.sql new file mode 100644 index 000000000..687db2e75 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201910171127__G_ALTER_MERCHANT_SUBSIDY.sql @@ -0,0 +1,2 @@ +alter table wx_merchant_subsidy modify column type tinyint(2) not null default 1 comment '结算类型1自主结算2微信结算'; +alter table wx_merchant_subsidy modify column source tinyint(2) not null default 0 comment '结算来源0结账1卡消费2券核销3砍价核销4拼团核销5收银分账'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index 3b7766abf..96b7ce338 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -127,4 +127,9 @@ public class WxMerchantSubsidy extends BaseEntity { return subsidyStr; } + @io.swagger.annotations.ApiModelProperty(value = "结算类型1微信结算2自主结算", name = "type") + private Integer type; + + @io.swagger.annotations.ApiModelProperty(value = "结算来源0补贴1卡消费2券核销3砍价核销4拼团核销5收银分账", name = "source") + private Integer source; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidySource.java b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidySource.java new file mode 100644 index 000000000..7c4ebd164 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidySource.java @@ -0,0 +1,39 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumMerchantSubsidySource { + + SUBSIDY(0, "补贴"), + CARD(1, "卡消费"), + COUPON(2, "券核销"), + PRESS(3, "砍价核销"), + GROUP(4, "拼团核销"), + CASHIER(5, "收银台"),; + + public static EnumMerchantSubsidySource getEnum(Integer code) { + for (EnumMerchantSubsidySource value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumMerchantSubsidySource(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java new file mode 100644 index 000000000..93a723fc8 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java @@ -0,0 +1,35 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumMerchantSubsidyType { + + MANUAL(1, "自主结算"), + WECHAT(2, "微信结算"),; + + public static EnumMerchantSubsidyType getEnum(Integer code) { + for (EnumMerchantSubsidyType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumMerchantSubsidyType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index dedfc379c..b3fd6dc8b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -533,6 +533,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); merchantSubsidy.setCreateDate(new Date()); merchantSubsidy.setUpdateDate(new Date()); + merchantSubsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); + merchantSubsidy.setSource(EnumMerchantSubsidySource.SUBSIDY.getCode()); try { wxMerchantSubsidyMapper.insert(merchantSubsidy); } catch (Exception e) {