Browse Source

[商户][新增]is_admin字段 是否为商管商户

release_toaliyun_real
hanxueda 7 years ago
parent
commit
06f2dfc881
5 changed files with 20 additions and 4 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java
  2. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  5. +5
    -1
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java View File

@@ -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")


+ 12
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java View File

@@ -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;
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java View File

@@ -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) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -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())) {
//若用户剩余积分比积分售价低则不能支付


+ 5
- 1
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml View File

@@ -22,12 +22,13 @@
<result column="email" property="email"/>
<result column="title" jdbcType="VARCHAR" property="title"/>
<result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/>
<result column="is_admin" jdbcType="INTEGER" property="isAdmin"/>

</resultMap>

<sql id="allColumns">
`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`
</sql>

<sql id="dynamicWhereConditions">
@@ -91,6 +92,9 @@
<if test=" null != email ">
and `email` = #{email}
</if>
<if test=" null != isAdmin ">
and `is_admin` = #{isAdmin}
</if>
<if test=" null != rentShopType ">
and id not in(
select merchant_id from wx_rent_contract where tenant_id=#{tenantId} and rent_shop_type=1 and merchant_id is


Loading…
Cancel
Save