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

Merge branch 'release_toaliyun_real_20230315' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230315

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
87ab47ab6b
2 измененных файлов: 2 добавлений и 0 удалений
  1. +1
    -0
      mallinkAdmin/src/main/resources/db/migration/V2023031500001_card.sql
  2. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java

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

@@ -0,0 +1 @@
update wx_card_info ci inner join wx_coupon_89 c on ci.coupon_id = c.id set ci.support_transfer = c.support_transfer where ci.support_transfer = 0;

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

@@ -248,6 +248,7 @@ public class WxCouponPasswordController extends BaseController {
Map retMap = new HashMap(); Map retMap = new HashMap();
retMap.put("title", coupon.getTitle()); retMap.put("title", coupon.getTitle());
retMap.put("couponPasswordId", password.getId()); retMap.put("couponPasswordId", password.getId());
retMap.put("supportTransfer", coupon.getSupportTransfer());
if (null != password.getCardId()) { if (null != password.getCardId()) {
WxCardInfo cardInfo = wxCardInfoService.getById(password.getCardId()); WxCardInfo cardInfo = wxCardInfoService.getById(password.getCardId());
if (null != cardInfo) { if (null != cardInfo) {


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