Browse Source

//OfflineActivity

release_toaliyun_real
xiaohu 1 year ago
parent
commit
d5abf2ed1e
6 changed files with 50 additions and 34 deletions
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java
  2. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityRecordGrantMapper.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxOfflineActivityGrantAwardService.java
  5. +36
    -30
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java
  6. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java View File

@@ -134,8 +134,8 @@ public class WxOfflineActivityGrantController extends BaseController {
}
TenantEntity tenantInfo = getTenantInfo();
wxOfflineActivityGrantAward.updateTenantInfo(tenantInfo);
WxOfflineActivityGrantAward grantAward = wxOfflineActivityGrantAwardService.grantAwardDetail(wxOfflineActivityGrantAward);
return new ResultData(grantAward);
List<WxOfflineActivityGrantAward> grantAwardList = wxOfflineActivityGrantAwardService.grantAwardDetail(wxOfflineActivityGrantAward);
return new ResultData(grantAwardList);
}

}

+ 6
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java View File

@@ -169,6 +169,12 @@ public class WxOfflineActivityRecord extends TenantEntity {
@TableField(value = "audit_status")
private Integer auditStatus;

/**
* 是否可发奖
*/
@TableField(exist = false)
private Integer grantStatus;

/**
* 审核人
*/


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityRecordGrantMapper.java View File

@@ -19,7 +19,7 @@ public interface WxOfflineActivityRecordGrantMapper extends CommonMapper<WxOffli

void insertList(@Param("recordGrantList")List<WxOfflineActivityRecordGrant> recordGrantList);

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




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxOfflineActivityGrantAwardService.java View File

@@ -31,7 +31,7 @@ public interface WxOfflineActivityGrantAwardService {

void recordExport(HttpServletRequest request, HttpServletResponse response, WxOfflineActivityRecord wxOfflineActivityRecord);

WxOfflineActivityGrantAward grantAwardDetail(WxOfflineActivityGrantAward wxOfflineActivityGrantAward);
List<WxOfflineActivityGrantAward> grantAwardDetail(WxOfflineActivityGrantAward wxOfflineActivityGrantAward);

void activityGrantExport(HttpServletRequest request, HttpServletResponse response, WxOfflineActivity wxOfflineActivity);
}

+ 36
- 30
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java View File

@@ -322,9 +322,9 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
if(record.getCreateDate().before(activity.getStartTime()) || record.getCreateDate().after(activity.getEndTime())){
throw new MallinkException(Result.ERROR, "请检查活动时间");
}
if(wxOfflineActivityRecordGrantMapper.selectGrantCount(activity.getTenantId(),activity.getId(),record.getId()) > 0){
throw new MallinkException(Result.ERROR, "请检查订单是否已参与活动");
}
// if(wxOfflineActivityRecordGrantMapper.selectGrantCount(activity.getTenantId(),activity.getId(),record.getId()) > 0){
// throw new MallinkException(Result.ERROR, "请检查订单是否已参与活动");
// }

orderMoneySum = orderMoneySum.add(record.getOrderMoney());
if(record.getLotteryNumList() != null && !record.getLotteryNumList().isEmpty()){
@@ -548,37 +548,43 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
}

@Override
public WxOfflineActivityGrantAward grantAwardDetail(WxOfflineActivityGrantAward wxOfflineActivityGrantAward) {
Long grantId = wxOfflineActivityRecordGrantMapper.selectGrantId(wxOfflineActivityGrantAward.getTenantId(),wxOfflineActivityGrantAward.getActivityId(),wxOfflineActivityGrantAward.getRecordId());
if(grantId == null){
public List<WxOfflineActivityGrantAward> grantAwardDetail(WxOfflineActivityGrantAward wxOfflineActivityGrantAward) {
List<Long> grantIds = wxOfflineActivityRecordGrantMapper.selectGrantId(wxOfflineActivityGrantAward.getTenantId(),wxOfflineActivityGrantAward.getActivityId(),wxOfflineActivityGrantAward.getRecordId());
if(grantIds == null || grantIds.isEmpty()){
return null;
}
WxOfflineActivityGrantAward grantAward = wxOfflineActivityGrantAwardMapper.selectById(grantId,wxOfflineActivityGrantAward.getTenantId());
//获取奖项
List<WxOfflineActivityItem> activityItemList = wxOfflineActivityItemService.getActivityItemList(grantAward.getActivityId(), grantAward.getTenantId());
grantAward.setActivityItemList(activityItemList);
//获取实际获得奖项
WxOfflineActivityGrantItem grantItemQ = new WxOfflineActivityGrantItem();
grantItemQ.updateTenantInfo(grantAward);
grantItemQ.setGrantId(grantId);
List<WxOfflineActivityGrantItem> grantItemList = wxOfflineActivityGrantItemMapper.findList(grantItemQ);
Map<Long, List<WxOfflineActivityGrantItem>> activityItemGrantMap = grantItemList.stream().collect(groupingBy(WxOfflineActivityGrantItem::getActivityItemId));
for (WxOfflineActivityItem activityItem : grantAward.getActivityItemList()) {
List<WxOfflineActivityGrantItem> grantActivityItemList = activityItemGrantMap.get(activityItem.getId());
if (grantActivityItemList == null || grantActivityItemList.isEmpty()) {
activityItem.setIsMeet(false);
continue;
}
for (WxOfflineActivityGrantItem grantItem : grantActivityItemList) {
grantItem.setMallSharePrice(grantItem.getAwardPrice()
.multiply(grantItem.getMallShareRate().divide(new BigDecimal(100)))
.setScale(2, RoundingMode.HALF_UP));
grantItem.setMerchantSharePrice(grantItem.getAwardPrice().subtract(grantItem.getMallSharePrice()));
WxOfflineActivityGrantAward grantAwardQ = new WxOfflineActivityGrantAward();
grantAwardQ.updateTenantInfo(wxOfflineActivityGrantAward);
grantAwardQ.setIds(grantIds);
List<WxOfflineActivityGrantAward> grantAwardList = wxOfflineActivityGrantAwardMapper.findList(grantAwardQ);
for (WxOfflineActivityGrantAward grantAward : grantAwardList) {
//获取奖项
List<WxOfflineActivityItem> activityItemList = wxOfflineActivityItemService.getActivityItemList(grantAward.getActivityId(), grantAward.getTenantId());
grantAward.setActivityItemList(activityItemList);
//获取实际获得奖项
WxOfflineActivityGrantItem grantItemQ = new WxOfflineActivityGrantItem();
grantItemQ.updateTenantInfo(grantAward);
grantItemQ.setGrantId(grantAward.getId());
List<WxOfflineActivityGrantItem> grantItemList = wxOfflineActivityGrantItemMapper.findList(grantItemQ);
Map<Long, List<WxOfflineActivityGrantItem>> activityItemGrantMap = grantItemList.stream().collect(groupingBy(WxOfflineActivityGrantItem::getActivityItemId));
for (WxOfflineActivityItem activityItem : grantAward.getActivityItemList()) {
List<WxOfflineActivityGrantItem> grantActivityItemList = activityItemGrantMap.get(activityItem.getId());
if (grantActivityItemList == null || grantActivityItemList.isEmpty()) {
activityItem.setIsMeet(false);
continue;
}
for (WxOfflineActivityGrantItem grantItem : grantActivityItemList) {
grantItem.setMallSharePrice(grantItem.getAwardPrice()
.multiply(grantItem.getMallShareRate().divide(new BigDecimal(100)))
.setScale(2, RoundingMode.HALF_UP));
grantItem.setMerchantSharePrice(grantItem.getAwardPrice().subtract(grantItem.getMallSharePrice()));
}
activityItem.setIsMeet(true);
activityItem.setActivityGrantItemList(grantActivityItemList);
}
activityItem.setIsMeet(true);
activityItem.setActivityGrantItemList(grantActivityItemList);
}
return grantAward;

return grantAwardList;
}

@Override


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java View File

@@ -142,6 +142,10 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco
}

if(activityId != null){
record.setGrantStatus(EnumYesOrNo.NO.getCode());
if(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode().equals(record.getAuditStatus())){
record.setGrantStatus(EnumYesOrNo.YES.getCode());
}
//判断订单是否发奖
Integer grantCount = wxOfflineActivityRecordGrantMapper.selectGrantCount(tenantEntity.getTenantId(),activityId,record.getId());
if(grantCount >= 1){


Loading…
Cancel
Save