Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
ade5f7e436
4 changed files with 6 additions and 3 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java
  2. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java
  4. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java View File

@@ -280,7 +280,7 @@ public class WxRaffleActivityController extends BaseController {
List<Long> aids = new ArrayList<Long>();;
aids.add(activity.getActivityId());
activity.setRecordItemList(wxCashBackActivityService.getActivityRecordItemListByRecordId(aids, id, tenantInfo));
activity.setItemDetail(activity.generateItemDetaiJson());
activity.setItemDetail(activity.generateItemDetaiJson(wxCashBackActivityService.getMallUserInfoMap(activity)));
if (null != activity.getMerchantId()) {
WxMerchant m = new WxMerchant();


+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java View File

@@ -135,7 +135,7 @@ public class WxRaffleActivityController extends BaseController {
List<Long> aids = new ArrayList<Long>();;
aids.add(activity.getActivityId());
activity.setRecordItemList(wxCashBackActivityService.getActivityRecordItemListByRecordId(aids, id, tenantInfo));
activity.setItemDetail(activity.generateItemDetaiJson());
activity.setItemDetail(activity.generateItemDetaiJson(wxCashBackActivityService.getMallUserInfoMap(activity)));
if (null != activity.getMerchantId()) {
WxMerchant m = new WxMerchant();
m.updateTenantInfo(activity);


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java View File

@@ -82,5 +82,7 @@ public interface WxRaffleActivityService {
void saveOrUpdateRecord(WxRaffleActivityRecord record);
Map<Long,MallUserInfo> getMallUserInfoMap(TenantEntity tenantEntity);
}

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java View File

@@ -216,7 +216,8 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService {
return itemMap;
}
private Map<Long,MallUserInfo> getMallUserInfoMap(TenantEntity tenantEntity) {
@Override
public Map<Long,MallUserInfo> getMallUserInfoMap(TenantEntity tenantEntity) {
MallUserInfo mui = new MallUserInfo();
mui.updateTenantInfo(tenantEntity);
return mallUserInfoService.getUserMap(mui);


Loading…
Cancel
Save