Przeglądaj źródła

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
winter 1 rok temu
rodzic
commit
066734b714
5 zmienionych plików z 38 dodań i 4 usunięć
  1. +17
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/OfflineActivityGrantRecord.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityRecordGrantMapper.java
  3. +7
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java
  4. +10
    -0
      mallinkService/src/main/resources/mapper/WxOfflineActivityRecordGrantMapper.xml
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml

+ 17
- 0
mallinkService/src/main/java/com/iformall/domain/vo/OfflineActivityGrantRecord.java Wyświetl plik

@@ -0,0 +1,17 @@
package com.iformall.domain.vo;

import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;

@Data
public class OfflineActivityGrantRecord implements Serializable {

private static final long serialVersionUID = 1L;

private Long grantId;
private Long recordId;
private String orderNo;
private Long merchantId;
}

+ 3
- 0
mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityRecordGrantMapper.java Wyświetl plik

@@ -3,6 +3,7 @@ package com.iformall.mapper;
import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxOfflineActivityRecordGrant;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.iformall.domain.vo.OfflineActivityGrantRecord;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -20,6 +21,8 @@ public interface WxOfflineActivityRecordGrantMapper extends CommonMapper<WxOffli
void insertList(@Param("recordGrantList")List<WxOfflineActivityRecordGrant> recordGrantList);

List<Long> selectGrantId(@Param("tenantId")String tenantId, @Param("activityId")Long activityId, @Param("recordId")Long recordId);

List<OfflineActivityGrantRecord> findGrantRecordList(@Param("activityId")Long activityId, @Param("tenantId")String tenantId);
}




+ 7
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java Wyświetl plik

@@ -9,6 +9,7 @@ import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.OfflineActivityGrantRecord;
import com.iformall.domain.vo.OfflineActivityRecordStatistics;
import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
@@ -615,13 +616,16 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
grantItemQ.setActivityId(wxOfflineActivity.getId());
List<WxOfflineActivityGrantItem> grantItem = wxOfflineActivityGrantItemMapper.findList(grantItemQ);
Map<Long, List<WxOfflineActivityGrantItem>> grantItemMap = grantItem.stream().collect(groupingBy(WxOfflineActivityGrantItem::getGrantId));
List<OfflineActivityGrantRecord> grantRecordList = wxOfflineActivityRecordGrantMapper.findGrantRecordList(wxOfflineActivity.getId(),wxOfflineActivity.getTenantId());
Map<Long, List<OfflineActivityGrantRecord>> grantRecordMap = grantRecordList.stream().collect(groupingBy(OfflineActivityGrantRecord::getGrantId));
for (WxOfflineActivityGrantAward grantAward : grantAwardList) {
List<WxOfflineActivityRecord> recordList = wxOfflineActivityRecordMapper.findGrantList(grantAward.getId(),grantAward.getTenantId());
// List<WxOfflineActivityRecord> recordList = wxOfflineActivityRecordMapper.findGrantList(grantAward.getId(),grantAward.getTenantId());
List<WxOfflineActivityGrantItem> grantItemList = grantItemMap.get(grantAward.getId());
List<OfflineActivityGrantRecord> recordList = grantRecordMap.get(grantAward.getId());
Map<String,Object> activityGrantObject = new HashMap<>();
activityGrantObject.put("activityName",activity.getName());
List<String> merchantOrder = new ArrayList<>();
for (WxOfflineActivityRecord record : recordList) {
List<String> merchantOrder = new ArrayList<>();
for (OfflineActivityGrantRecord record : recordList) {
merchantOrder.add(record.getOrderNo()+"["+merchantMap.get(record.getMerchantId())+"]");
}
activityGrantObject.put("merchantOrder", String.join(";", merchantOrder));


+ 10
- 0
mallinkService/src/main/resources/mapper/WxOfflineActivityRecordGrantMapper.xml Wyświetl plik

@@ -38,4 +38,14 @@
where activity_id = #{activityId} and record_id = #{recordId} and tenant_id=#{tenantId}
</select>

<select id="findGrantRecordList" parameterType="java.util.HashMap" resultType="com.iformall.domain.vo.OfflineActivityGrantRecord">
select rg.grant_id as grantId,
r.id as recordId,
r.order_no as orderNo,
r.merchant_id as merchantId
from wx_offline_activity_record_grant rg
left join wx_offline_activity_record r on rg.record_id = r.id
where rg.activity_id = #{activityId} and rg.tenant_id=#{tenantId}
</select>

</mapper>

+ 1
- 1
mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml Wyświetl plik

@@ -236,7 +236,7 @@
r.cus_card,r.lottery_num,r.lottery_count,
r.anniversary_lottery_num,r.create_by,r.merchant_id,r.business_id,
r.create_date,r.update_date,r.audit_remark,
r.audit_status,r.audit_by,audit_time
r.audit_status,r.audit_by,r.audit_time
from wx_offline_activity_record_grant rg
left join wx_offline_activity_record r on rg.record_id = r.id
where rg.grant_id = #{grantId} and rg.tenant_id=#{tenantId}


Ładowanie…
Anuluj
Zapisz