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

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

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
908a1150f5
2 измененных файлов: 5 добавлений и 5 удалений
  1. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java
  2. +1
    -1
      mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql

+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java Просмотреть файл

@@ -60,7 +60,7 @@ public class WxCampaignController extends BaseController {
if (wxCampaign.getStatus() != null && wxCampaign.getStatus() == -1) {
wxCampaign.setStatus(null);
}
wxCampaign.updateTenantInfo(getTenantInfo());
wxCampaign.updateTenantInfo(ifParentUpdateTenantInfo());
wxCampaign.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC);
final PageInfo<WxCampaign> page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize);
return new ResultData(page);
@@ -78,7 +78,7 @@ public class WxCampaignController extends BaseController {
wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0]));
}
wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode());
wxCampaign.updateTenantInfo(getTenantInfo());
wxCampaign.updateTenantInfo(ifParentUpdateTenantInfo());
wxCampaignService.saveOrUpdate(wxCampaign);
return new ResultData();
}
@@ -89,7 +89,7 @@ public class WxCampaignController extends BaseController {
public ResultData addByPath(@RequestBody WxCampaign wxCampaign) {
logger.debug("[" + getIpAddr() + "] WxCampaignController::addByPath");
wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode());
wxCampaign.updateTenantInfo(getTenantInfo());
wxCampaign.updateTenantInfo(ifParentUpdateTenantInfo());
wxCampaignService.addForPath(wxCampaign);
return new ResultData();
}
@@ -159,7 +159,7 @@ public class WxCampaignController extends BaseController {
WxCampaign wxCampaign = wxCampaignService.getById(id);
if (wxCampaign != null) {
WxCouponChannel wxCouponChannel = new WxCouponChannel();
wxCouponChannel.updateTenantInfo(getTenantInfo());
wxCouponChannel.updateTenantInfo(ifParentUpdateTenantInfo());
wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode());
wxCouponChannel.setSubTargetId(wxCampaign.getId());
wxCouponChannel.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode());


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

@@ -1,4 +1,4 @@
update mall_sale_type set menus = '[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 203, 204, 206, 207, 501, 502, 503, 504, 505, 506, 507, 511, 512, 522, 523, 509, 591, 595, 601, 621, 622, 623, 624, 625, 626, 627, 901, 902]' where id=100
update mall_sale_type set menus = '[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 203, 204, 206, 207, 501, 502, 503, 504, 505, 506, 507, 511, 512, 522, 523, 509, 591, 595, 601, 605, 621, 622, 623, 624, 625, 626, 627, 671, 901, 902]' where id=100


CREATE DEFINER=`root`@`%` PROCEDURE `init_after_group`(IN tenantId VARCHAR(25),IN subTenantIds VARCHAR(250))


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