Procházet zdrojové kódy

fix

release_toaliyun_real
winter před 2 roky
rodič
revize
3ee3c14f72
4 změnil soubory, kde provedl 28 přidání a 4 odebrání
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityMerchant.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java
  4. +22
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java Zobrazit soubor

@@ -178,7 +178,7 @@ public class WxCashBackActivityController extends BaseController {
TenantEntity tenantInfo = getTenantInfo();
WxCashBackActivity activity = wxCashBackActivityService.getActivityById(id, tenantInfo.getTenantId());
activity.setItemList(wxCashBackActivityService.getActivityItems(id, tenantInfo.getTenantId()));
activity.setMerchantList(wxCashBackActivityService.getActivityMerchants(id, tenantInfo.getTenantId()));
activity.setMerchantList(wxCashBackActivityService.getActivityMerchants(id, tenantInfo.getTenantId(),true));
return new ResultData(activity);
}


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityMerchant.java Zobrazit soubor

@@ -1,5 +1,6 @@
package com.iformall.domain.po;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.domain.po.base.TenantEntity;
import lombok.Data;
@@ -24,4 +25,7 @@ public class WxCashBackActivityMerchant extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "最低订单金额", name = "merchantId")
private Long merchantId;
@TableField(exist = false)
private WxMerchant merchant;
}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java Zobrazit soubor

@@ -61,7 +61,7 @@ public interface WxCashBackActivityService {
List<WxCashBackActivityItem> getActivityItems(Long activityId,String tenantId);
List<WxCashBackActivityMerchant> getActivityMerchants(Long activityId,String tenantId);
List<WxCashBackActivityMerchant> getActivityMerchants(Long activityId,String tenantId,boolean hasMerchantInfo);
void exportData(List objectList,String sheetName,Class objectCalss,HttpServletRequest request, HttpServletResponse response);


+ 22
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java Zobrazit soubor

@@ -304,11 +304,31 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService
}

@Override
public List<WxCashBackActivityMerchant> getActivityMerchants(Long activityId, String tenantId) {
public List<WxCashBackActivityMerchant> getActivityMerchants(Long activityId, String tenantId,boolean hasMerchantInfo) {
WxCashBackActivityMerchant m = new WxCashBackActivityMerchant();
m.setActivityId(activityId);
m.setTenantId(tenantId);
return wxCashBackActivityMerchantMapper.findList(m);
List<WxCashBackActivityMerchant> amlist = wxCashBackActivityMerchantMapper.findList(m);
if (hasMerchantInfo && null != amlist && amlist.size() > 0 ) {
WxMerchant mq = new WxMerchant();
mq.setTenantId(tenantId);
List<WxMerchant> mlist = wxMerchantMapper.findList(mq);
Map<Long,WxMerchant> merchantMap = new HashMap<Long,WxMerchant>();
if (null != mlist && mlist.size() > 0 ) {
for (WxMerchant _m : mlist) {
merchantMap.put(_m.getId(), _m);
}
}
for (WxCashBackActivityMerchant am : amlist) {
if (null != am.getMerchantId()) {
WxMerchant _mm = merchantMap.get(am.getMerchantId());
if (null != _mm) {
am.setMerchant(_mm);
}
}
}
}
return amlist;
}

@Override


Načítá se…
Zrušit
Uložit