From 06f2dfc881a58bf69431112a8cf3a493af3e73dc Mon Sep 17 00:00:00 2001 From: hanxueda Date: Thu, 18 Apr 2019 15:54:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E6=96=B0=E5=A2=9E]is=5Fad?= =?UTF-8?q?min=E5=AD=97=E6=AE=B5=20=E6=98=AF=E5=90=A6=E4=B8=BA=E5=95=86?= =?UTF-8?q?=E7=AE=A1=E5=95=86=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxCreditHistory.java | 2 +- .../main/java/com/iformall/domain/po/WxMerchant.java | 12 ++++++++++++ .../main/java/com/iformall/enums/EnumScoreType.java | 2 +- .../iformall/service/impl/WxOrderServiceImpl.java | 2 +- .../src/main/resources/mapper/WxMerchantMapper.xml | 6 +++++- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java index 34a406903..3407b4ba9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -52,7 +52,7 @@ public class WxCreditHistory implements Serializable { @io.swagger.annotations.ApiModelProperty(value="每笔积分明细",name="creditNum") private Integer creditNum; /**积分类型*/ - @io.swagger.annotations.ApiModelProperty(value="积分类型 1每日登录,2消费,3绑车牌,4连接WIFI,5微信用户昵称授权,6微信用户手机授权,7完善个人信息,8积分导入,10增加积分,11积分兑换,12减少积分 注:11积分兑换改为走订单接口",name="creditType") + @io.swagger.annotations.ApiModelProperty(value="积分类型 1每日登录,2消费,3绑车牌,4连接WIFI,5微信用户昵称授权,6微信用户手机授权,7完善个人信息,8积分导入,10增加积分,11积分兑换,12线下积分扣除 注:11积分兑换改为走订单接口",name="creditType") private Integer creditType; /**创建日期*/ @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 130815114..bf4c8287b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -158,6 +158,18 @@ public class WxMerchant implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "封面图", name = "coverPicture") private String coverPicture; + /*商户状态**/ + @io.swagger.annotations.ApiModelProperty(value="是否为商管商户 1是 0否",name="status") + private Integer isAdmin; + + public Integer getIsAdmin() { + return isAdmin; + } + + public void setIsAdmin(Integer isAdmin) { + this.isAdmin = isAdmin; + } + public String getTitle() { return title; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java b/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java index 48fd39a53..c5da16787 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java @@ -15,7 +15,7 @@ public enum EnumScoreType { MEM_IMPORT(8, "会员导入"), MEM_REDUCE(9, "会员成长值扣减"), SPEND_CREDIT(10, "增加积分"), - REDUCE_CREDIT(12, "减少积分"), + REDUCE_CREDIT(12, "线下积分扣除"), CHANGE_CREDIT(11, "积分兑换"); public static EnumScoreType getEnum(Integer code) { 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 92e893b22..7a375aadf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -422,7 +422,7 @@ public class WxOrderServiceImpl implements WxOrderService { record.setOrderNumber(orderNumber); record.setCouponChannelId(couponChannelId); record.setProductId(couponId); - //当salePrice为0时 则进行积分支付 + //当salePrice为0 并且为积分券或者积分停车券时 则进行积分支付 if (coupon.getCreditPrice() != null && coupon.getSalePrice() != null && coupon.getSalePrice() == 0 && (coupon.getType() == EnumCouponType.COUPON_CREDIT.getCode() || coupon.getType() == EnumCouponType.COUPON_CREDIT_PARK.getCode())) { //若用户剩余积分比积分售价低则不能支付 diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 087fd9ab5..9b03df279 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -22,12 +22,13 @@ + `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, - `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture` + `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin` @@ -91,6 +92,9 @@ and `email` = #{email} + + and `is_admin` = #{isAdmin} + and id not in( select merchant_id from wx_rent_contract where tenant_id=#{tenantId} and rent_shop_type=1 and merchant_id is