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

[卡券][修复]:卡券领取条件名更改

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
fd296070de
7 измененных файлов: 15 добавлений и 13 удалений
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906251500__CHANGE_CONDITION_COLUMN.sql
  2. +2
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  6. +4
    -4
      mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
  7. +4
    -4
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201906251500__CHANGE_CONDITION_COLUMN.sql Просмотреть файл

@@ -0,0 +1,2 @@
ALTER TABLE wx_coupon`
CHANGE COLUMN `condition` `conditions` JSON NULL DEFAULT NULL ;

+ 2
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Просмотреть файл

@@ -90,10 +90,10 @@ public class WxOrderController extends BaseController {
}

private ResultData couponUserCheck(WxCUser user, WxCouponCVo coupon) {
if (coupon.getCondition() == null) return null;
if (coupon.getConditions() == null) return null;
JSONObject jo = null;
try {
jo = JSONObject.parseObject(coupon.getCondition());
jo = JSONObject.parseObject(coupon.getConditions());
} catch (Exception e) {
logger.error("购买券条件判断错误:ID=" + coupon.getId() + e.getMessage());
}


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

@@ -143,7 +143,7 @@ public class WxCoupon extends BaseEntity {
private Integer creditRefund;

@io.swagger.annotations.ApiModelProperty(value="领取条件",name="condition")
private String condition;
private String conditions;


@Transient


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java Просмотреть файл

@@ -67,7 +67,7 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {
private Integer creditPrice;

@io.swagger.annotations.ApiModelProperty(value="领取条件",name="condition")
private String condition;
private String conditions;

@Transient
private String salePriceStr;


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

@@ -732,7 +732,7 @@ public class WxOrderServiceImpl implements WxOrderService {
// 记录活动
JSONObject jo = null;
try {
jo = JSONObject.parseObject(coupon.getCondition());
jo = JSONObject.parseObject(coupon.getConditions());
} catch (Exception e) {
logger.error("购买券条件判断错误:ID=" + coupon.getId() + e.getMessage());
}


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

@@ -123,7 +123,7 @@
<sql id="CouponChannelVoColumns">
<include refid="allColumns" />,
c.remain_inventory,c.inventory,c.cover_img,c.title,c.sub_title,c.sale_price,
c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type,c.support_transfer,c.press_limit_num,c.auto_refund,c.condition,
c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type,c.support_transfer,c.press_limit_num,c.auto_refund,c.conditions,
c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.credit_price
</sql>

@@ -160,7 +160,7 @@
<result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/>
<result column="valid_days" jdbcType="INTEGER" property="validDays"/>
<result column="qr_code" property="qrCode"/>
<result column="condition" jdbcType="VARCHAR" property="condition" />
<result column="conditions" jdbcType="VARCHAR" property="conditions" />


<collection column="{productId=coupon_id}" property="merchantVoList"
@@ -205,7 +205,7 @@
c.tenant_id,c.type,c.cover_img,c.cover_picture,c.detail_picture,c.title,c.sub_title,c.sale_price,c.use_price,
c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,
c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,
c.create_date,c.update_date,c.business,c.sub_business,c.support_transfer,c.press_limit_num, c.auto_refund,c.credit_price,c.condition,
c.create_date,c.update_date,c.business,c.sub_business,c.support_transfer,c.press_limit_num, c.auto_refund,c.credit_price,c.conditions,
cc.qr_code
</sql>

@@ -247,7 +247,7 @@
<result column="press_limit_num" jdbcType="INTEGER" property="pressLimitNum"/>
<result column="auto_refund" jdbcType="INTEGER" property="autoRefund"/>
<result column="qr_code" property="qrCode"/>
<result column="condition" jdbcType="VARCHAR" property="condition" />
<result column="conditions" jdbcType="VARCHAR" property="conditions" />

<collection column="{productId=coupon_id}" property="merchantVoList"
ofType="com.iformall.domain.vo.WxMerchantVo"


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

@@ -38,7 +38,7 @@
<result column="credit_price" jdbcType="INTEGER" property="creditPrice"/>
<result column="credit_refund" jdbcType="INTEGER" property="creditRefund"/>
<result column="is_del" property="isDel"/>
<result column="condition" jdbcType="VARCHAR" property="condition"/>
<result column="conditions" jdbcType="VARCHAR" property="conditions"/>

</resultMap>
<resultMap id="statisMap" type="com.iformall.domain.vo.WxCouponStatisVo">
@@ -92,7 +92,7 @@
`id`,`tenant_id`,`type`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`,
`valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`,
`remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`,
`press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`,`condition`
`press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`,`conditions`
</sql>

<sql id="dynamicWhereConditions">
@@ -467,7 +467,7 @@
<result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/>
<result column="press_limit_num" jdbcType="INTEGER" property="pressLimitNum"/>
<result column="press_limit_hours" jdbcType="INTEGER" property="pressLimitHours"/>
<result column="condition" jdbcType="VARCHAR" property="condition"/>
<result column="conditions" jdbcType="VARCHAR" property="conditions"/>

<collection column="{productId=id}" property="merchantVoList"
ofType="com.iformall.domain.vo.WxMerchantVo"
@@ -793,7 +793,7 @@
wc.tenant_id,wc.`type`,wc.`cover_img`,wc.`cover_picture`,wc.`detail_picture`,wc.`title`,wc.`sub_title`,wc.`sale_price`,wc.`use_price`,wc.`use_limit_quantity`,wc.`send_type`,
wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`price`,wc.`unit`,wc.`remain_inventory`,wc.`inventory`,
wc.`remark`,wc.`status`,wc.`create_date`,wc.`update_date`,wc.`business`,wc.`sub_business`,wc.`support_transfer`,wc.`subsidy_num`,wc.`subsidy_type`,
wc.`press_limit_num`, wc.`press_limit_hours`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund`,wx.`condition`
wc.`press_limit_num`, wc.`press_limit_hours`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund`,wx.`conditions`
,wc.title as couponName,wc.`cover_img` as couponPic,wc.`cover_picture` as couponPicture,wc.`detail_picture` as detailPicture,wc.id as couponId from wx_coupon_channel ct left join
wx_coupon wc on wc.id = ct.coupon_id
where ct.`sub_target_id` = #{id}


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