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

[A端][更改]:修改购买发券条件参数名

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
eea4426d03
4 измененных файлов: 9 добавлений и 9 удалений
  1. +5
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
  3. +2
    -2
      mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml

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

@@ -56,7 +56,7 @@ public class WxCouponSend implements Serializable {
private Integer sendType;
/*发券条件**/
@io.swagger.annotations.ApiModelProperty(value="发券条件",name="condition")
private String condition;
private String conditions;
/*0:有效 1:无效**/
@io.swagger.annotations.ApiModelProperty(value="0:有效 1:无效",name="status")
private Integer status;
@@ -98,12 +98,12 @@ public class WxCouponSend implements Serializable {
sendType = _sendType;
}

public String getCondition() {
return condition;
public String getConditions() {
return conditions;
}

public void setCondition(String condition) {
this.condition = condition;
public void setConditions(String conditions) {
this.conditions = conditions;
}

public Integer getStatus() {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java Просмотреть файл

@@ -75,7 +75,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
WxOrder wxOrder = (WxOrder)param;

try {
JSONObject jo = JSONObject.parseObject(wxCouponSend.getCondition());
JSONObject jo = JSONObject.parseObject(wxCouponSend.getConditions());
if (wxOrder.getProductId().equals(jo.getLong("id")))
return true;
else


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

@@ -7,14 +7,14 @@
<result column="coupon_id" jdbcType="BIGINT" property="couponId" />
<result column="title" jdbcType="VARCHAR" property="title" />
<result column="send_type" jdbcType="INTEGER" property="sendType" />
<result column="condition" jdbcType="VARCHAR" property="condition" />
<result column="conditions" jdbcType="VARCHAR" property="conditions" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`coupon_id`,`title`,`send_type`,`condition`,`status`,`create_date`,`update_date`
`id`,`tenant_id`,`coupon_id`,`title`,`send_type`,`conditions`,`status`,`create_date`,`update_date`
</sql>

<sql id="dynamicWhereConditions">


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

@@ -118,7 +118,7 @@
left join wx_merchant_b_user mbu on mtd.b_user_id = mbu.id

where 1=1
and m.status = 1
<if test=" null != merchantName ">
and m.name like concat('%', #{merchantName},'%')
</if>


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