Procházet zdrojové kódy

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

release_toaliyun_real
winter před 1 rokem
rodič
revize
364dc750c6
7 změnil soubory, kde provedl 141 přidání a 111 odebrání
  1. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityGrantSettlementMapper.java
  3. +90
    -64
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantItemServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java
  6. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java
  7. +42
    -41
      mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml

+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java Zobrazit soubor

@@ -215,9 +215,9 @@ public class WxOfflineActivityController extends BaseController {
@ApiOperation("活动奖项订单发放明细导出") @ApiOperation("活动奖项订单发放明细导出")
@GetMapping("/grantItemExport") @GetMapping("/grantItemExport")
public void grantItemExport(@ModelAttribute OfflineActivityAwardsItemVo offlineActivityAwardsItemVo, HttpServletRequest request, HttpServletResponse response) { public void grantItemExport(@ModelAttribute OfflineActivityAwardsItemVo offlineActivityAwardsItemVo, HttpServletRequest request, HttpServletResponse response) {
if(offlineActivityAwardsItemVo.getId() == null){
throw new MallinkException(Result.ERROR,"ID 为空");
}
// if(offlineActivityAwardsItemVo.getId() == null){
// throw new MallinkException(Result.ERROR,"ID 为空");
// }
if(offlineActivityAwardsItemVo.getActivityItemId() == null){ if(offlineActivityAwardsItemVo.getActivityItemId() == null){
throw new MallinkException(Result.ERROR,"活动项ID 为空"); throw new MallinkException(Result.ERROR,"活动项ID 为空");
} }


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityGrantSettlementMapper.java Zobrazit soubor

@@ -33,7 +33,7 @@ public interface WxOfflineActivityGrantSettlementMapper extends CommonMapper<WxO


List<OfflineActivityGrantItemVo> findAwardItemGrantList(WxOfflineActivityGrantSettlement grantSettlement); List<OfflineActivityGrantItemVo> findAwardItemGrantList(WxOfflineActivityGrantSettlement grantSettlement);


List<OfflineActivityGrantItemVo> findAwardItemGrantCountList(WxOfflineActivityGrantSettlement grantSettlement);
// List<OfflineActivityGrantItemVo> findAwardItemGrantCountList(WxOfflineActivityGrantSettlement grantSettlement);
} }






+ 90
- 64
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java Zobrazit soubor

@@ -241,24 +241,24 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
activityItem.setIsMeet(true); activityItem.setIsMeet(true);
handleCashback(activity,activityItem,wxOfflineActivityGrantAward.getRecordList()); handleCashback(activity,activityItem,wxOfflineActivityGrantAward.getRecordList());


WxOfflineActivityGrantCashBack activityGrantCashBack = activityItem.getActivityGrantCashBack();
WxOfflineActivityGrantCashBack lastActivityGrantCashBack = getLastActivityGrantCashBack(wxOfflineActivityGrantAward, activity.getId(), activityItem.getId());
if(lastActivityGrantCashBack != null){
BigDecimal subtracted = lastActivityGrantCashBack.getCashBackPrice().subtract(lastActivityGrantCashBack.getTaxPointsAmount());
String msg = "已返现:"+subtracted+"元 ";
if(subtracted.compareTo(activityItem.getCashBackPrice()) > 0){
msg += "顾客应退:"+subtracted.subtract(activityItem.getCashBackPrice())+"元 ";
}else{
msg += "应补顾客:"+activityItem.getCashBackPrice().subtract(subtracted)+"元 ";
}
if(lastActivityGrantCashBack.getTaxPointsAmount().compareTo(activityGrantCashBack.getTaxPointsAmount()) > 0){
msg += "税款退还:"+lastActivityGrantCashBack.getTaxPointsAmount().subtract(activityGrantCashBack.getTaxPointsAmount())+"元 ";
}else{
msg += "顾客补税:"+activityGrantCashBack.getTaxPointsAmount().subtract(lastActivityGrantCashBack.getTaxPointsAmount())+"元 ";
}
activityItem.setCashBackMsg(msg);
}
// WxOfflineActivityGrantCashBack activityGrantCashBack = activityItem.getActivityGrantCashBack();
//
// WxOfflineActivityGrantCashBack lastActivityGrantCashBack = getLastActivityGrantCashBack(wxOfflineActivityGrantAward, activity.getId(), activityItem.getId());
// if(lastActivityGrantCashBack != null){
// BigDecimal subtracted = lastActivityGrantCashBack.getCashBackPrice().subtract(lastActivityGrantCashBack.getTaxPointsAmount());
// String msg = "已返现:"+subtracted+"元 ";
// if(subtracted.compareTo(activityItem.getCashBackPrice()) > 0){
// msg += "顾客应退:"+subtracted.subtract(activityItem.getCashBackPrice())+"元 ";
// }else{
// msg += "应补顾客:"+activityItem.getCashBackPrice().subtract(subtracted)+"元 ";
// }
// if(lastActivityGrantCashBack.getTaxPointsAmount().compareTo(activityGrantCashBack.getTaxPointsAmount()) > 0){
// msg += "税款退还:"+lastActivityGrantCashBack.getTaxPointsAmount().subtract(activityGrantCashBack.getTaxPointsAmount())+"元 ";
// }else{
// msg += "顾客补税:"+activityGrantCashBack.getTaxPointsAmount().subtract(lastActivityGrantCashBack.getTaxPointsAmount())+"元 ";
// }
// activityItem.setCashBackMsg(msg);
// }
} }
} }
} }
@@ -629,14 +629,14 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
wxOfflineActivityGrantAwardMapper.insert(wxOfflineActivityGrantAward); wxOfflineActivityGrantAwardMapper.insert(wxOfflineActivityGrantAward);


//失效 //失效
WxOfflineActivityGrantAward upd = new WxOfflineActivityGrantAward();
upd.setId(wxOfflineActivityGrantAward.getId());
upd.updateTenantInfo(wxOfflineActivityGrantAward);
upd.setStatus(EnumYesOrNo.NO.getCode());
upd.setActivityId(activity.getId());
upd.setCusPhone(wxOfflineActivityGrantAward.getCusPhone());
upd.setUpdateDate(now);
wxOfflineActivityGrantAwardMapper.updateStatusNo(upd);
// WxOfflineActivityGrantAward upd = new WxOfflineActivityGrantAward();
// upd.setId(wxOfflineActivityGrantAward.getId());
// upd.updateTenantInfo(wxOfflineActivityGrantAward);
// upd.setStatus(EnumYesOrNo.NO.getCode());
// upd.setActivityId(activity.getId());
// upd.setCusPhone(wxOfflineActivityGrantAward.getCusPhone());
// upd.setUpdateDate(now);
// wxOfflineActivityGrantAwardMapper.updateStatusNo(upd);


//创建订单关联 //创建订单关联
wxOfflineActivityRecordGrantService.insertFromGrantAward(wxOfflineActivityGrantAward); wxOfflineActivityRecordGrantService.insertFromGrantAward(wxOfflineActivityGrantAward);
@@ -1878,14 +1878,14 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
if(activityItem == null){ if(activityItem == null){
throw new MallinkException(Result.ERROR, "未查询到活动数据"); throw new MallinkException(Result.ERROR, "未查询到活动数据");
} }
if(!EnumOfflineActivityMode.ONE.getCode().equals(activityItem.getModeType())){
throw new MallinkException(Result.ERROR, "发奖类型非单笔订单计算");
}
// if(!EnumOfflineActivityMode.ONE.getCode().equals(activityItem.getModeType())){
// throw new MallinkException(Result.ERROR, "发奖类型非单笔订单计算");
// }


if(EnumOfflineActivityType.LOTTERY_DRAW.getCode().equals(activityItem.getType())){ if(EnumOfflineActivityType.LOTTERY_DRAW.getCode().equals(activityItem.getType())){
WxOfflineActivityAwardsModel activityAwardsModel = wxOfflineActivityAwardsModelMapper.selectById(offlineActivityAwardsItemVo.getId(), offlineActivityAwardsItemVo.getTenantId());
if(activityAwardsModel == null || !activityAwardsModel.getActivityItemId().equals(activityItem.getId())){
throw new MallinkException(Result.ERROR, "查询活动数据异常");
WxOfflineActivityAwardsModel activityAwardsModel = null;
if(offlineActivityAwardsItemVo.getId() != null){
activityAwardsModel = wxOfflineActivityAwardsModelMapper.selectById(offlineActivityAwardsItemVo.getId(), offlineActivityAwardsItemVo.getTenantId());
} }
grantItemLotteryDrawExport(request,response,activityItem,activityAwardsModel); grantItemLotteryDrawExport(request,response,activityItem,activityAwardsModel);


@@ -1894,16 +1894,16 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
// if(activityAwardsModel == null || !activityAwardsModel.getActivityItemId().equals(activityItem.getId())){ // if(activityAwardsModel == null || !activityAwardsModel.getActivityItemId().equals(activityItem.getId())){
// throw new MallinkException(Result.ERROR, "查询活动数据异常"); // throw new MallinkException(Result.ERROR, "查询活动数据异常");
// } // }
WxOfflineActivityAwardsItem wxOfflineActivityAwardsItem = wxOfflineActivityAwardsItemMapper.selectById(offlineActivityAwardsItemVo.getId(), offlineActivityAwardsItemVo.getTenantId());
if(wxOfflineActivityAwardsItem == null || !wxOfflineActivityAwardsItem.getActivityItemId().equals(activityItem.getId())){
throw new MallinkException(Result.ERROR, "查询活动数据异常");
WxOfflineActivityAwardsItem wxOfflineActivityAwardsItem = null;
if(offlineActivityAwardsItemVo.getId() != null){
wxOfflineActivityAwardsItem = wxOfflineActivityAwardsItemMapper.selectById(offlineActivityAwardsItemVo.getId(), offlineActivityAwardsItemVo.getTenantId());
} }
grantItemGiftExport(request,response,activityItem,wxOfflineActivityAwardsItem); grantItemGiftExport(request,response,activityItem,wxOfflineActivityAwardsItem);


} else if (EnumOfflineActivityType.CASHBACK.getCode().equals(activityItem.getType())) { } else if (EnumOfflineActivityType.CASHBACK.getCode().equals(activityItem.getType())) {
WxOfflineActivityAwardsItem wxOfflineActivityAwardsItem = wxOfflineActivityAwardsItemMapper.selectById(offlineActivityAwardsItemVo.getId(), offlineActivityAwardsItemVo.getTenantId());
if(wxOfflineActivityAwardsItem == null || !wxOfflineActivityAwardsItem.getActivityItemId().equals(activityItem.getId())){
throw new MallinkException(Result.ERROR, "查询活动数据异常");
WxOfflineActivityAwardsItem wxOfflineActivityAwardsItem = null;
if(offlineActivityAwardsItemVo.getId() != null){
wxOfflineActivityAwardsItem = wxOfflineActivityAwardsItemMapper.selectById(offlineActivityAwardsItemVo.getId(), offlineActivityAwardsItemVo.getTenantId());
} }
grantItemCashbackExport(request,response,activityItem,wxOfflineActivityAwardsItem); grantItemCashbackExport(request,response,activityItem,wxOfflineActivityAwardsItem);


@@ -1942,7 +1942,8 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
WxOfflineActivityGrantSettlement grantSettlement = new WxOfflineActivityGrantSettlement(); WxOfflineActivityGrantSettlement grantSettlement = new WxOfflineActivityGrantSettlement();
grantSettlement.updateTenantInfo(activityItem); grantSettlement.updateTenantInfo(activityItem);
grantSettlement.setActivityItemId(activityItem.getId()); grantSettlement.setActivityItemId(activityItem.getId());
List<OfflineActivityGrantItemVo> grantItemList = wxOfflineActivityGrantSettlementMapper.findAwardItemGrantCountList(grantSettlement);
grantSettlement.setGrantAwardsMode(EnumOfflineActivityAwardsModeType.COUNT.getCode());
List<OfflineActivityGrantItemVo> grantItemList = wxOfflineActivityGrantSettlementMapper.findAwardItemGrantList(grantSettlement);
if(grantItemList != null && !grantItemList.isEmpty()){ if(grantItemList != null && !grantItemList.isEmpty()){
Map<Long, List<String>> grantItemRecordMap = grantItemList.stream().collect(groupingBy(OfflineActivityGrantItemVo::getGrantItemId,Collectors.mapping(OfflineActivityGrantItemVo::getOrderNo,Collectors.toList()))); Map<Long, List<String>> grantItemRecordMap = grantItemList.stream().collect(groupingBy(OfflineActivityGrantItemVo::getGrantItemId,Collectors.mapping(OfflineActivityGrantItemVo::getOrderNo,Collectors.toList())));


@@ -2103,8 +2104,11 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
WxOfflineActivityGrantSettlement grantSettlement = new WxOfflineActivityGrantSettlement(); WxOfflineActivityGrantSettlement grantSettlement = new WxOfflineActivityGrantSettlement();
grantSettlement.updateTenantInfo(activityItem); grantSettlement.updateTenantInfo(activityItem);
grantSettlement.setActivityItemId(activityItem.getId()); grantSettlement.setActivityItemId(activityItem.getId());
grantSettlement.setMinMoney(activityAwardsModel.getMinAmount());
grantSettlement.setMaxMoney(activityAwardsModel.getMaxAmount());
grantSettlement.setGrantAwardsMode(EnumOfflineActivityAwardsModeType.AMOUNT.getCode());
if(activityAwardsModel != null){
grantSettlement.setMinMoney(activityAwardsModel.getMinAmount());
grantSettlement.setMaxMoney(activityAwardsModel.getMaxAmount());
}
List<OfflineActivityGrantItemVo> grantItemList = wxOfflineActivityGrantSettlementMapper.findAwardItemGrantList(grantSettlement); List<OfflineActivityGrantItemVo> grantItemList = wxOfflineActivityGrantSettlementMapper.findAwardItemGrantList(grantSettlement);
if(grantItemList != null && !grantItemList.isEmpty()){ if(grantItemList != null && !grantItemList.isEmpty()){
grantItemMap = grantItemList.stream().collect(groupingBy(OfflineActivityGrantItemVo::getRecordId)); grantItemMap = grantItemList.stream().collect(groupingBy(OfflineActivityGrantItemVo::getRecordId));
@@ -2113,12 +2117,14 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
Map<Long, Long> grantItemSizeMap = grantItemList.stream().collect(groupingBy(OfflineActivityGrantItemVo::getRecordId, counting())); Map<Long, Long> grantItemSizeMap = grantItemList.stream().collect(groupingBy(OfflineActivityGrantItemVo::getRecordId, counting()));
Long maxGrantItemSize = Collections.max(grantItemSizeMap.values()); Long maxGrantItemSize = Collections.max(grantItemSizeMap.values());
for (int i = 0; i < maxGrantItemSize.intValue(); i++) { for (int i = 0; i < maxGrantItemSize.intValue(); i++) {
ExcelExportEntity entity_1 = new ExcelExportEntity("订单奖品名称","awardName_"+i,20);
ExcelExportEntity entity_1 = new ExcelExportEntity("奖品名称","awardName_"+i,20);
exportHead.add(entity_1); exportHead.add(entity_1);
ExcelExportEntity entity_2 = new ExcelExportEntity("订单奖品数量","awardCount_"+i,20);
ExcelExportEntity entity_2 = new ExcelExportEntity("奖品数量","awardCount_"+i,20);
exportHead.add(entity_2); exportHead.add(entity_2);
ExcelExportEntity entity_3 = new ExcelExportEntity("订单奖品价值","awardPrice_"+i,20);
ExcelExportEntity entity_3 = new ExcelExportEntity("奖品价值","awardPrice_"+i,20);
exportHead.add(entity_3); exportHead.add(entity_3);
ExcelExportEntity entity_3_ = new ExcelExportEntity("实际承担价值","realGrantPrice_"+i,20);
exportHead.add(entity_3_);
ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate_"+i,20); ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate_"+i,20);
exportHead.add(entity_4); exportHead.add(entity_4);
ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate_"+i,20); ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate_"+i,20);
@@ -2151,6 +2157,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
grantItemObject.put("awardName_"+i,grantItem.getAwardName()); grantItemObject.put("awardName_"+i,grantItem.getAwardName());
grantItemObject.put("awardCount_"+i,grantItem.getAwardCount()); grantItemObject.put("awardCount_"+i,grantItem.getAwardCount());
grantItemObject.put("awardPrice_"+i,grantItem.getAwardPrice()); grantItemObject.put("awardPrice_"+i,grantItem.getAwardPrice());
grantItemObject.put("realGrantPrice_"+i,grantItem.getRealGrantPrice());
grantItemObject.put("mallShareRate_"+i,grantItem.getMallShareRate()); grantItemObject.put("mallShareRate_"+i,grantItem.getMallShareRate());
grantItemObject.put("merchantShareRate_"+i,grantItem.getMerchantShareRate()); grantItemObject.put("merchantShareRate_"+i,grantItem.getMerchantShareRate());
grantItemObject.put("realMallSharePrice_"+i,grantItem.getRealMallSharePrice()); grantItemObject.put("realMallSharePrice_"+i,grantItem.getRealMallSharePrice());
@@ -2173,17 +2180,22 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
WxOfflineActivityGrantSettlement grantSettlement = new WxOfflineActivityGrantSettlement(); WxOfflineActivityGrantSettlement grantSettlement = new WxOfflineActivityGrantSettlement();
grantSettlement.updateTenantInfo(activityItem); grantSettlement.updateTenantInfo(activityItem);
grantSettlement.setActivityItemId(activityItem.getId()); grantSettlement.setActivityItemId(activityItem.getId());
grantSettlement.setAwardItamId(wxOfflineActivityAwardsItem.getId());
grantSettlement.setGrantAwardsMode(EnumOfflineActivityAwardsModeType.AMOUNT.getCode());
if(wxOfflineActivityAwardsItem != null){
grantSettlement.setAwardItamId(wxOfflineActivityAwardsItem.getId());
}
List<OfflineActivityGrantItemVo> grantItemList = wxOfflineActivityGrantSettlementMapper.findAwardItemGrantList(grantSettlement); List<OfflineActivityGrantItemVo> grantItemList = wxOfflineActivityGrantSettlementMapper.findAwardItemGrantList(grantSettlement);
if(grantItemList != null && !grantItemList.isEmpty()){ if(grantItemList != null && !grantItemList.isEmpty()){


//订单表头 //订单表头
ExcelExportEntity entity_1 = new ExcelExportEntity("订单奖品名称","awardName",20);
ExcelExportEntity entity_1 = new ExcelExportEntity("奖品名称","awardName",20);
exportHead.add(entity_1); exportHead.add(entity_1);
ExcelExportEntity entity_2 = new ExcelExportEntity("订单奖品数量","awardCount",20);
ExcelExportEntity entity_2 = new ExcelExportEntity("奖品数量","awardCount",20);
exportHead.add(entity_2); exportHead.add(entity_2);
ExcelExportEntity entity_3 = new ExcelExportEntity("订单奖品价值","awardPrice",20);
ExcelExportEntity entity_3 = new ExcelExportEntity("奖品价值","awardPrice",20);
exportHead.add(entity_3); exportHead.add(entity_3);
ExcelExportEntity entity_3_ = new ExcelExportEntity("实际承担价值","realGrantPrice",20);
exportHead.add(entity_3_);
ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate",20); ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate",20);
exportHead.add(entity_4); exportHead.add(entity_4);
ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate",20); ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate",20);
@@ -2210,6 +2222,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
grantItemObject.put("awardName",grantItem.getAwardName()); grantItemObject.put("awardName",grantItem.getAwardName());
grantItemObject.put("awardCount",grantItem.getAwardCount()); grantItemObject.put("awardCount",grantItem.getAwardCount());
grantItemObject.put("awardPrice",grantItem.getAwardPrice()); grantItemObject.put("awardPrice",grantItem.getAwardPrice());
grantItemObject.put("realGrantPrice",grantItem.getRealGrantPrice());
grantItemObject.put("mallShareRate",grantItem.getMallShareRate()); grantItemObject.put("mallShareRate",grantItem.getMallShareRate());
grantItemObject.put("merchantShareRate",grantItem.getMerchantShareRate()); grantItemObject.put("merchantShareRate",grantItem.getMerchantShareRate());
grantItemObject.put("realMallSharePrice",grantItem.getRealMallSharePrice()); grantItemObject.put("realMallSharePrice",grantItem.getRealMallSharePrice());
@@ -2232,18 +2245,23 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
WxOfflineActivityGrantSettlement grantSettlement = new WxOfflineActivityGrantSettlement(); WxOfflineActivityGrantSettlement grantSettlement = new WxOfflineActivityGrantSettlement();
grantSettlement.updateTenantInfo(activityItem); grantSettlement.updateTenantInfo(activityItem);
grantSettlement.setActivityItemId(activityItem.getId()); grantSettlement.setActivityItemId(activityItem.getId());
grantSettlement.setAwardItamId(wxOfflineActivityAwardsItem.getId());
grantSettlement.setGrantAwardsMode(EnumOfflineActivityAwardsModeType.AMOUNT.getCode());
if(wxOfflineActivityAwardsItem != null){
grantSettlement.setAwardItamId(wxOfflineActivityAwardsItem.getId());
}
List<OfflineActivityGrantItemVo> grantItemList = wxOfflineActivityGrantSettlementMapper.findAwardItemGrantList(grantSettlement); List<OfflineActivityGrantItemVo> grantItemList = wxOfflineActivityGrantSettlementMapper.findAwardItemGrantList(grantSettlement);
if(grantItemList != null && !grantItemList.isEmpty()){ if(grantItemList != null && !grantItemList.isEmpty()){
//订单表头 //订单表头
ExcelExportEntity entity_1 = new ExcelExportEntity("订单返现名称","awardName",20);
ExcelExportEntity entity_1 = new ExcelExportEntity("返现名称","awardName",20);
exportHead.add(entity_1); exportHead.add(entity_1);
// ExcelExportEntity entity_2 = new ExcelExportEntity("数量","awardCount",20); // ExcelExportEntity entity_2 = new ExcelExportEntity("数量","awardCount",20);
// exportHead.add(entity_2); // exportHead.add(entity_2);
ExcelExportEntity entity_2 = new ExcelExportEntity("订单返现比例(%)","cashBackRatio",20);
ExcelExportEntity entity_2 = new ExcelExportEntity("返现比例(%)","cashBackRatio",20);
exportHead.add(entity_2); exportHead.add(entity_2);
ExcelExportEntity entity_3 = new ExcelExportEntity("订单返现金额","awardPrice",20);
ExcelExportEntity entity_3 = new ExcelExportEntity("返现金额","awardPrice",20);
exportHead.add(entity_3); exportHead.add(entity_3);
ExcelExportEntity entity_3_ = new ExcelExportEntity("实际承担金额","realGrantPrice",20);
exportHead.add(entity_3_);
ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate",20); ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate",20);
exportHead.add(entity_4); exportHead.add(entity_4);
ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate",20); ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate",20);
@@ -2252,14 +2270,16 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
exportHead.add(entity_6); exportHead.add(entity_6);
ExcelExportEntity entity_7 = new ExcelExportEntity("商管承担金额","realMerchantSharePrice",20); ExcelExportEntity entity_7 = new ExcelExportEntity("商管承担金额","realMerchantSharePrice",20);
exportHead.add(entity_7); exportHead.add(entity_7);
ExcelExportEntity entity_8 = new ExcelExportEntity("税点金额起点","startingTaxPoint",20);
exportHead.add(entity_8);
ExcelExportEntity entity_9 = new ExcelExportEntity("税点比例(%)","taxPoints",20);
exportHead.add(entity_9);
ExcelExportEntity entity_10 = new ExcelExportEntity("税点金额","taxPointsAmount",20);
exportHead.add(entity_10);
ExcelExportEntity entity_11 = new ExcelExportEntity("实际返现金额","realCashBackPrice",20);
exportHead.add(entity_11);
if(EnumOfflineActivityMode.ONE.getCode().equals(activityItem.getModeType())){
ExcelExportEntity entity_8 = new ExcelExportEntity("税点金额起点","startingTaxPoint",20);
exportHead.add(entity_8);
ExcelExportEntity entity_9 = new ExcelExportEntity("税点比例(%)","taxPoints",20);
exportHead.add(entity_9);
ExcelExportEntity entity_10 = new ExcelExportEntity("税点金额","taxPointsAmount",20);
exportHead.add(entity_10);
ExcelExportEntity entity_11 = new ExcelExportEntity("实际返现金额","realCashBackPrice",20);
exportHead.add(entity_11);
}


List<Long> recordIds = grantItemList.stream().map(OfflineActivityGrantItemVo::getRecordId).distinct().collect(toList()); List<Long> recordIds = grantItemList.stream().map(OfflineActivityGrantItemVo::getRecordId).distinct().collect(toList());
List<Long> grantIds = grantItemList.stream().map(OfflineActivityGrantItemVo::getGrantId).distinct().collect(toList()); List<Long> grantIds = grantItemList.stream().map(OfflineActivityGrantItemVo::getGrantId).distinct().collect(toList());
@@ -2279,15 +2299,17 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
// grantItemObject.put("awardCount",grantItem.getAwardCount()); // grantItemObject.put("awardCount",grantItem.getAwardCount());
grantItemObject.put("cashBackRatio",grantItem.getCashBackRatio()); grantItemObject.put("cashBackRatio",grantItem.getCashBackRatio());
grantItemObject.put("awardPrice",grantItem.getAwardPrice()); grantItemObject.put("awardPrice",grantItem.getAwardPrice());
grantItemObject.put("realGrantPrice",grantItem.getRealGrantPrice());
grantItemObject.put("mallShareRate",grantItem.getMallShareRate()); grantItemObject.put("mallShareRate",grantItem.getMallShareRate());
grantItemObject.put("merchantShareRate",grantItem.getMerchantShareRate()); grantItemObject.put("merchantShareRate",grantItem.getMerchantShareRate());
grantItemObject.put("realMallSharePrice",grantItem.getRealMallSharePrice()); grantItemObject.put("realMallSharePrice",grantItem.getRealMallSharePrice());
grantItemObject.put("realMerchantSharePrice",grantItem.getRealMerchantSharePrice()); grantItemObject.put("realMerchantSharePrice",grantItem.getRealMerchantSharePrice());

grantItemObject.put("startingTaxPoint",grantItem.getStartingTaxPoint()); grantItemObject.put("startingTaxPoint",grantItem.getStartingTaxPoint());
grantItemObject.put("taxPoints",grantItem.getTaxPoints()); grantItemObject.put("taxPoints",grantItem.getTaxPoints());
grantItemObject.put("taxPointsAmount",grantItem.getTaxPointsAmount()); grantItemObject.put("taxPointsAmount",grantItem.getTaxPointsAmount());
if(grantItem.getTaxPointsAmount() != null){ if(grantItem.getTaxPointsAmount() != null){
grantItemObject.put("realCashBackPrice",grantItem.getAwardPrice().subtract(grantItem.getTaxPointsAmount()));
grantItemObject.put("realCashBackPrice",grantItem.getRealGrantPrice().subtract(grantItem.getTaxPointsAmount()));
}else{ }else{
grantItemObject.put("realCashBackPrice",grantItem.getAwardPrice()); grantItemObject.put("realCashBackPrice",grantItem.getAwardPrice());
} }
@@ -2321,11 +2343,14 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
ExcelExportEntity entity10 = new ExcelExportEntity("提交时间","createDate",20); ExcelExportEntity entity10 = new ExcelExportEntity("提交时间","createDate",20);
entity10.setFormat("yyyy-MM-dd HH:mm:ss"); entity10.setFormat("yyyy-MM-dd HH:mm:ss");
headList.add(entity10); headList.add(entity10);
ExcelExportEntity entity11 = new ExcelExportEntity("审核人","auditByName",20);
ExcelExportEntity entity11 = new ExcelExportEntity("订单状态","auditStatus",20);
entity11.setReplace(new String[]{"审核中_0", "已审批_1", "已驳回_2", "已退单_3", "已发奖_10"});
headList.add(entity11); headList.add(entity11);
ExcelExportEntity entity12 = new ExcelExportEntity("审核时间","auditTime",20);
entity12.setFormat("yyyy-MM-dd HH:mm:ss");
ExcelExportEntity entity12 = new ExcelExportEntity("审核人","auditByName",20);
headList.add(entity12); headList.add(entity12);
ExcelExportEntity entity13 = new ExcelExportEntity("审核时间","auditTime",20);
entity13.setFormat("yyyy-MM-dd HH:mm:ss");
headList.add(entity13);




ExcelExportEntity entity20 = new ExcelExportEntity("客户姓名","cusName",20); ExcelExportEntity entity20 = new ExcelExportEntity("客户姓名","cusName",20);
@@ -2364,6 +2389,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
grantItemObject.put("lotteryCount",record.getLotteryCount()); grantItemObject.put("lotteryCount",record.getLotteryCount());
grantItemObject.put("anniversaryLotteryNum",record.getAnniversaryLotteryNum()); grantItemObject.put("anniversaryLotteryNum",record.getAnniversaryLotteryNum());
grantItemObject.put("createDate",record.getCreateDate()); grantItemObject.put("createDate",record.getCreateDate());
grantItemObject.put("auditStatus",record.getAuditStatus());
grantItemObject.put("auditByName",record.getAuditByName()); grantItemObject.put("auditByName",record.getAuditByName());
grantItemObject.put("auditTime",record.getAuditTime()); grantItemObject.put("auditTime",record.getAuditTime());




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

@@ -76,7 +76,7 @@ public class WxOfflineActivityGrantItemServiceImpl implements WxOfflineActivityG
} }
wxOfflineActivityGrantItemMapper.insertList(grantItemList); wxOfflineActivityGrantItemMapper.insertList(grantItemList);


wxOfflineActivityGrantItemMapper.updateStatusNo(wxOfflineActivityGrantAward);
// wxOfflineActivityGrantItemMapper.updateStatusNo(wxOfflineActivityGrantAward);


if(!cashBackList.isEmpty()) wxOfflineActivityGrantCashBackMapper.insertList(cashBackList); if(!cashBackList.isEmpty()) wxOfflineActivityGrantCashBackMapper.insertList(cashBackList);




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

@@ -197,7 +197,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct
} }


wxOfflineActivityGrantSettlementMapper.insertList(settlementList); wxOfflineActivityGrantSettlementMapper.insertList(settlementList);
wxOfflineActivityGrantSettlementMapper.updateStatusNo(wxOfflineActivityGrantAward);
// wxOfflineActivityGrantSettlementMapper.updateStatusNo(wxOfflineActivityGrantAward);
} }


@Override @Override


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java Zobrazit soubor

@@ -293,6 +293,9 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco
creditHistory.setCreditType(EnumScoreType.POINT_CHANGE.getCode()); creditHistory.setCreditType(EnumScoreType.POINT_CHANGE.getCode());


Integer increasedPoints = record.getIncreasedPoints(); Integer increasedPoints = record.getIncreasedPoints();
if(increasedPoints == null){
increasedPoints = 0;
}
if(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode().equals(record.getAuditStatus())){ if(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode().equals(record.getAuditStatus())){
if(increasedPoints > 0){ if(increasedPoints > 0){
return; return;


+ 42
- 41
mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml Zobrazit soubor

@@ -301,46 +301,46 @@
where `activity_id` = #{activityId} and `cus_phone` = #{cusPhone} and `id` != #{id}) where `activity_id` = #{activityId} and `cus_phone` = #{cusPhone} and `id` != #{id})
</update> </update>


<select id="findAwardItemGrantList" parameterType="com.iformall.domain.po.WxOfflineActivityGrantSettlement" resultType="com.iformall.domain.vo.OfflineActivityGrantItemVo">
select gi.grant_id,
gi.activity_id,gi.activity_name,
gi.activity_item_id,gi.activity_item_name,
gi.award_itam_id,gi.award_name,
gi.cash_back_ratio,gi.award_price,gi.award_count,
gi.starting_tax_point,gi.tax_points,gi.tax_points_amount,
gi.mall_share_rate,gi.merchant_share_rate,
gs.record_id,
gs.grant_item_id,
gs.order_no,gs.order_money,
gs.merchant_id,
gs.real_grant_price,
gs.real_mall_share_price,gs.real_merchant_share_price
from wx_offline_activity_grant_item gi
inner join wx_offline_activity_grant_settlement gs on gs.grant_item_id = gi.id and gs.record_id = gi.record_id
where gi.status = 1 and gi.grant_awards_mode = 1 and gi.record_id is not null
<if test=" null != tenantId and '' != tenantId">
and gi.`tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and gi.`parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != activityItemId ">
and gi.`activity_item_id` = #{activityItemId}
</if>
<if test=" null != awardItamId ">
and gi.`award_itam_id` = #{awardItamId}
</if>
<if test=" null != minMoney">
and gs.`order_money` &gt;= #{minMoney}
</if>
<if test=" null != maxMoney">
and gs.`order_money` &lt; #{maxMoney}
</if>
order by gi.`create_date` desc
</select>
<select id="findAwardItemGrantCountList" resultType="com.iformall.domain.vo.OfflineActivityGrantItemVo">
<!-- <select id="findAwardItemGrantList" parameterType="com.iformall.domain.po.WxOfflineActivityGrantSettlement" resultType="com.iformall.domain.vo.OfflineActivityGrantItemVo">-->
<!-- select gi.grant_id,-->
<!-- gi.activity_id,gi.activity_name,-->
<!-- gi.activity_item_id,gi.activity_item_name,-->
<!-- gi.award_itam_id,gi.award_name,-->
<!-- gi.cash_back_ratio,gi.award_price,gi.award_count,-->
<!-- gi.starting_tax_point,gi.tax_points,gi.tax_points_amount,-->
<!-- gi.mall_share_rate,gi.merchant_share_rate,-->
<!-- gs.record_id,-->
<!-- gs.grant_item_id,-->
<!-- gs.order_no,gs.order_money,-->
<!-- gs.merchant_id,-->
<!-- gs.real_grant_price,-->
<!-- gs.real_mall_share_price,gs.real_merchant_share_price-->
<!-- from wx_offline_activity_grant_item gi-->
<!-- inner join wx_offline_activity_grant_settlement gs on gs.grant_item_id = gi.id and gs.record_id = gi.record_id-->
<!-- where gi.status = 1 and gi.grant_awards_mode = 1 and gi.record_id is not null-->
<!-- <if test=" null != tenantId and '' != tenantId">-->
<!-- and gi.`tenant_id` = #{tenantId}-->
<!-- </if>-->
<!-- <if test=" null != parentTenantId and '' != parentTenantId">-->
<!-- and gi.`parent_tenant_id` = #{parentTenantId}-->
<!-- </if>-->
<!-- <if test=" null != activityItemId ">-->
<!-- and gi.`activity_item_id` = #{activityItemId}-->
<!-- </if>-->
<!-- <if test=" null != awardItamId ">-->
<!-- and gi.`award_itam_id` = #{awardItamId}-->
<!-- </if>-->
<!-- <if test=" null != minMoney">-->
<!-- and gs.`order_money` &gt;= #{minMoney}-->
<!-- </if>-->
<!-- <if test=" null != maxMoney">-->
<!-- and gs.`order_money` &lt; #{maxMoney}-->
<!-- </if>-->
<!-- order by gi.`create_date` desc-->
<!-- </select>-->
<select id="findAwardItemGrantList" resultType="com.iformall.domain.vo.OfflineActivityGrantItemVo">
select gi.grant_id, select gi.grant_id,
gi.activity_id,gi.activity_name, gi.activity_id,gi.activity_name,
gi.activity_item_id,gi.activity_item_name, gi.activity_item_id,gi.activity_item_name,
@@ -356,7 +356,8 @@
gs.real_mall_share_price,gs.real_merchant_share_price gs.real_mall_share_price,gs.real_merchant_share_price
from wx_offline_activity_grant_settlement gs from wx_offline_activity_grant_settlement gs
left join wx_offline_activity_grant_item gi on gs.grant_item_id = gi.id left join wx_offline_activity_grant_item gi on gs.grant_item_id = gi.id
where gi.status = 1 and gi.grant_awards_mode = 2
where gi.status = 1
and gi.grant_awards_mode = #{grantAwardsMode}
<if test=" null != tenantId and '' != tenantId"> <if test=" null != tenantId and '' != tenantId">
and gi.`tenant_id` = #{tenantId} and gi.`tenant_id` = #{tenantId}
</if> </if>


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