From c59da367e1bd1d44dc26c87313d2ea599c561767 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 13 Aug 2019 09:46:28 +0800 Subject: [PATCH] =?UTF-8?q?[POS][=E4=BF=AE=E6=94=B9]:=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201908130940__POS_CHANGED.sql | 2 ++ .../java/com/iformall/controller/PosController.java | 2 +- .../com/iformall/service/impl/PosServiceImpl.java | 1 + .../java/com/iformall/domain/po/PosMallConfig.java | 13 ++++++++----- .../main/java/com/iformall/pay/WxPayConstant.java | 1 + .../main/resources/mapper/PosMallConfigMapper.xml | 6 +++++- 6 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201908130940__POS_CHANGED.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201908130940__POS_CHANGED.sql b/mallinkAdmin/src/main/resources/db/migration/V201908130940__POS_CHANGED.sql new file mode 100644 index 000000000..1108a87bf --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201908130940__POS_CHANGED.sql @@ -0,0 +1,2 @@ +alter table pos_mall_config +add column `card` tinyint(6) NOT NULL DEFAULT '0' COMMENT '会员优惠券状态,0-使用中,1-禁用'; \ No newline at end of file diff --git a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java index 19ae02c5a..264165e65 100644 --- a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java +++ b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java @@ -31,7 +31,7 @@ public class PosController extends BaseController { private final PosService posService; private final ThDevInfoService thDevInfoService; - @ApiOperation(value = "获取会员折扣/优惠券是否启用", notes = "{" + + @ApiOperation(value = "获取会员折扣/优惠券/消费卡是否启用", notes = "{" + "\"dev_id\":\"string(必填)\"," + "\"tenant_id\":\"string(必填)\"," + "\"nonce_str\":\"string(必填)\"}") diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 823342b38..35dab742b 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -73,6 +73,7 @@ public class PosServiceImpl implements PosService { } retMap.put(WxPayConstant.MEM_DISCOUNT, String.valueOf(config.getDiscount().equals(EnumEnableType.Enable.getCode()))); retMap.put(WxPayConstant.MEM_COUPON, String.valueOf(config.getCoupon().equals(EnumEnableType.Enable.getCode()))); + retMap.put(WxPayConstant.MEM_CARD, String.valueOf(config.getCard().equals(EnumEnableType.Enable.getCode()))); return retMap; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java index a5a9d24d4..fe9386fd1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java @@ -1,17 +1,18 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; + import javax.persistence.*; import java.util.*; -import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; @Table(name = "pos_mall_config") @Data -public class PosMallConfig implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class PosMallConfig extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -22,10 +23,12 @@ public class PosMallConfig implements Serializable { @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - @io.swagger.annotations.ApiModelProperty(value="会员折扣状态,0-使用中,1-禁用",name="discount") + @io.swagger.annotations.ApiModelProperty(value="会员折扣是否开启,0-使用中,1-禁用",name="discount") private Integer discount; - @io.swagger.annotations.ApiModelProperty(value="会员优惠券状态,0-使用中,1-禁用",name="coupon") + @io.swagger.annotations.ApiModelProperty(value="会员优惠券是否开启,0-使用中,1-禁用",name="coupon") private Integer coupon; + @io.swagger.annotations.ApiModelProperty(value="会员消费卡是否开启,0-使用中,1-禁用",name="card") + private Integer card; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java b/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java index b2ab46da9..d73ed7831 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java @@ -37,6 +37,7 @@ public class WxPayConstant { public final static String MEM_DISCOUNT = "discount"; public final static String MEM_COUPON = "coupon"; + public final static String MEM_CARD = "card"; public final static String MEM_LEVEL = "level"; public final static String AVAIL_CO_LIST = "avail_co_list"; public final static String ID = "id"; diff --git a/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml b/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml index 23bad233f..3694b3242 100644 --- a/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,10 @@ and `coupon` = #{coupon} - + + + and `card` = #{card} + and `create_date` = #{createDate}