diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index 6ddab10f7..8509358e9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -10,6 +10,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCouponChannelDto; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCouponChannelVo; +import com.iformall.enums.EnumCouponSourceType; import com.iformall.enums.EnumPayWay; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxCouponChannelVo; @@ -68,10 +69,13 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); + if(null == wxCouponChannel.getSourceType()){ + wxCouponChannel.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); + } + if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); } - final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 073be6bcd..ef3bc5e9f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -946,9 +946,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc // } if (oldUserBase != null) { - if(!oldUserBase.getTenantId().contains(","+mallUserInfo.getTenantId()+",")){ - oldUserBase.setTenantId(oldUserBase.getTenantId()+mallUserInfo.getTenantId()+","); - } +// if(!oldUserBase.getTenantId().contains(","+mallUserInfo.getTenantId()+",")){ +// oldUserBase.setTenantId(oldUserBase.getTenantId()+mallUserInfo.getTenantId()+","); +// } oldUserBase.setName(userBase.getName()); oldUserBase.setSex(userBase.getSex()); oldUserBase.setNickName(userBase.getNickName()); @@ -971,7 +971,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc } } else { userBase.setId(idWorker.nextId()); - userBase.setTenantId(","+mallUserInfo.getTenantId()+","); +// userBase.setTenantId(","+mallUserInfo.getTenantId()+","); userBase.setUpdateDate(userBase.getUpdateDate() == null ? new Date() : userBase.getUpdateDate()); userBase.setCreateDate(userBase.getCreateDate() == null ? new Date() : userBase.getCreateDate()); //新增积分