Просмотр исходного кода

[POS][修改]:消费是否开启添加

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
c59da367e1
6 измененных файлов: 18 добавлений и 7 удалений
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201908130940__POS_CHANGED.sql
  2. +1
    -1
      mallinkPosApi/src/main/java/com/iformall/controller/PosController.java
  3. +1
    -0
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  4. +8
    -5
      mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java
  5. +1
    -0
      mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java
  6. +5
    -1
      mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml

+ 2
- 0
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-禁用';

+ 1
- 1
mallinkPosApi/src/main/java/com/iformall/controller/PosController.java Просмотреть файл

@@ -31,7 +31,7 @@ public class PosController extends BaseController {
private final PosService posService; private final PosService posService;
private final ThDevInfoService thDevInfoService; private final ThDevInfoService thDevInfoService;


@ApiOperation(value = "获取会员折扣/优惠券是否启用", notes = "{" +
@ApiOperation(value = "获取会员折扣/优惠券/消费卡是否启用", notes = "{" +
"\"dev_id\":\"string(必填)\"," + "\"dev_id\":\"string(必填)\"," +
"\"tenant_id\":\"string(必填)\"," + "\"tenant_id\":\"string(必填)\"," +
"\"nonce_str\":\"string(必填)\"}") "\"nonce_str\":\"string(必填)\"}")


+ 1
- 0
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_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_COUPON, String.valueOf(config.getCoupon().equals(EnumEnableType.Enable.getCode())));
retMap.put(WxPayConstant.MEM_CARD, String.valueOf(config.getCard().equals(EnumEnableType.Enable.getCode())));
return retMap; return retMap;
} }




+ 8
- 5
mallinkService/src/main/java/com/iformall/domain/po/PosMallConfig.java Просмотреть файл

@@ -1,17 +1,18 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*; import javax.persistence.*;
import java.util.*; import java.util.*;
import java.math.*;
import javax.persistence.Transient; import javax.persistence.Transient;
import java.util.List; import java.util.List;
import javax.persistence.Id; import javax.persistence.Id;
import java.io.Serializable;


@Table(name = "pos_mall_config") @Table(name = "pos_mall_config")
@Data @Data
public class PosMallConfig implements Serializable {
@EqualsAndHashCode(callSuper = true)
public class PosMallConfig extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@@ -22,10 +23,12 @@ public class PosMallConfig implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String 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; private Integer discount;
@io.swagger.annotations.ApiModelProperty(value="会员优惠券状态,0-使用中,1-禁用",name="coupon")
@io.swagger.annotations.ApiModelProperty(value="会员优惠券是否开启,0-使用中,1-禁用",name="coupon")
private Integer coupon; private Integer coupon;
@io.swagger.annotations.ApiModelProperty(value="会员消费卡是否开启,0-使用中,1-禁用",name="card")
private Integer card;
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate; private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")


+ 1
- 0
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_DISCOUNT = "discount";
public final static String MEM_COUPON = "coupon"; 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 MEM_LEVEL = "level";
public final static String AVAIL_CO_LIST = "avail_co_list"; public final static String AVAIL_CO_LIST = "avail_co_list";
public final static String ID = "id"; public final static String ID = "id";


+ 5
- 1
mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml Просмотреть файл

@@ -6,6 +6,7 @@
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
<result column="discount" jdbcType="INTEGER" property="discount" /> <result column="discount" jdbcType="INTEGER" property="discount" />
<result column="coupon" jdbcType="INTEGER" property="coupon" /> <result column="coupon" jdbcType="INTEGER" property="coupon" />
<result column="card" jdbcType="INTEGER" property="card" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
</resultMap> </resultMap>
@@ -27,7 +28,10 @@
</if> </if>
<if test=" null != coupon "> <if test=" null != coupon ">
and `coupon` = #{coupon} and `coupon` = #{coupon}
</if>
</if>
<if test=" null != card ">
and `card` = #{card}
</if>
<if test=" null != createDate "> <if test=" null != createDate ">
and `create_date` = #{createDate} and `create_date` = #{createDate}
</if> </if>


Загрузка…
Отмена
Сохранить