Parcourir la source

fix

release_toaliyun_real
winter il y a 2 ans
Parent
révision
52abf11043
3 fichiers modifiés avec 27 ajouts et 5 suppressions
  1. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java
  3. +24
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java

+ 1
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java Voir le fichier

@@ -77,6 +77,7 @@ public class WxCashBackActivityController extends BaseController {
}
}
wxCashBackActivity.setSortColumns(SortField.CreateDate_DESC);
wxCashBackActivity.setHasGenericMerchant(true);
final PageInfo<WxCashBackActivity> page = wxCashBackActivityService.listActivityAsPage(wxCashBackActivity, pageNum, pageSize);
return new ResultData(page);
}


+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java Voir le fichier

@@ -63,7 +63,8 @@ public class WxCashBackActivity extends TenantEntity {
@TableField(exist = false)
private Long merchantId;
@TableField(exist = false)
private boolean hasGenericMerchant;
}

+ 24
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java Voir le fichier

@@ -13,6 +13,7 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxCUserBasicInfoVo;
import com.iformall.enums.EnumCashBackActivityItemRule;
import com.iformall.enums.EnumCashBackActivityRecordStatus;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.mapper.WxCashBackActivityItemMapper;
import com.iformall.mapper.WxCashBackActivityMapper;
import com.iformall.mapper.WxCashBackActivityMerchantMapper;
@@ -52,11 +53,30 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService
@Override
public PageInfo<WxCashBackActivity> listActivityAsPage(WxCashBackActivity record, Integer pageIndex, Integer pageSize) {
if (null != record.getMerchantId()) {
List<Long> aids = wxCashBackActivityMerchantMapper.findActivityIdList(record.getMerchantId(), record.getTenantId());
if (null == aids || aids.size() <= 0 ) {
record.setId(-1L);
//如果包含所有商户通用的活动
if (record.isHasGenericMerchant()) {
WxCashBackActivity _a = new WxCashBackActivity();
_a.updateTenantInfo(record);
_a.setAllMerchant(EnumYesOrNo.YES.getCode());
List<Long> allMids = wxCashBackActivityMapper.findIds(_a);
List<Long> aids = wxCashBackActivityMerchantMapper.findActivityIdList(record.getMerchantId(), record.getTenantId());
if (null == aids || aids.size() <= 0 ) {
if (null == allMids || allMids.size() <= 0 ) {
record.setId(-1L);
}else {
record.setIds(allMids);
}
}else {
allMids.addAll(aids);
record.setIds(allMids);
}
}else {
record.setIds(aids);
List<Long> aids = wxCashBackActivityMerchantMapper.findActivityIdList(record.getMerchantId(), record.getTenantId());
if (null == aids || aids.size() <= 0 ) {
record.setId(-1L);
}else {
record.setIds(aids);
}
}
}
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCashBackActivityMapper.findList(record));


Chargement…
Annuler
Enregistrer