Explorar el Código

...

release_toaliyun_real
xhxu hace 5 años
padre
commit
cbaef37d7b
Se han modificado 2 ficheros con 9 adiciones y 5 borrados
  1. +5
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
  2. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java

+ 5
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java Ver fichero

@@ -10,6 +10,7 @@ import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.WxCouponChannelDto; import com.iformall.domain.dto.WxCouponChannelDto;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.domain.vo.WxCouponChannelVo;
import com.iformall.enums.EnumCouponSourceType;
import com.iformall.enums.EnumPayWay; import com.iformall.enums.EnumPayWay;
import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.domain.vo.WxCouponChannelVo;
@@ -68,10 +69,13 @@ public class WxCouponChannelController extends BaseController {
wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.updateTenantInfo(getTenantInfo());
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC);


if(null == wxCouponChannel.getSourceType()){
wxCouponChannel.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
}

if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){
wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn());
} }

final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java Ver fichero

@@ -946,9 +946,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
// } // }


if (oldUserBase != null) { 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.setName(userBase.getName());
oldUserBase.setSex(userBase.getSex()); oldUserBase.setSex(userBase.getSex());
oldUserBase.setNickName(userBase.getNickName()); oldUserBase.setNickName(userBase.getNickName());
@@ -971,7 +971,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
} }
} else { } else {
userBase.setId(idWorker.nextId()); userBase.setId(idWorker.nextId());
userBase.setTenantId(","+mallUserInfo.getTenantId()+",");
// userBase.setTenantId(","+mallUserInfo.getTenantId()+",");
userBase.setUpdateDate(userBase.getUpdateDate() == null ? new Date() : userBase.getUpdateDate()); userBase.setUpdateDate(userBase.getUpdateDate() == null ? new Date() : userBase.getUpdateDate());
userBase.setCreateDate(userBase.getCreateDate() == null ? new Date() : userBase.getCreateDate()); userBase.setCreateDate(userBase.getCreateDate() == null ? new Date() : userBase.getCreateDate());
//新增积分 //新增积分


Cargando…
Cancelar
Guardar