Browse Source

修复错误的Bir;网点导出异常修复;网点导入异常修复

v1.0
Yen 2 years ago
parent
commit
69b9960954
  1. 6
      src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java
  2. 4
      src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
  3. 25
      src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java
  4. 3
      src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java
  5. 5
      src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java
  6. 7
      src/main/resources/mapper/bir/BirBaseActivityMapper.xml

6
src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java

@ -17,5 +17,11 @@ public interface BirBaseActivityMapper extends BaseMapper<BirBaseActivity> {
List<TbsActivity> selectByBirActivity(@Param("startDate") LocalDate startDate, @Param("endDate")LocalDate endDate); List<TbsActivity> selectByBirActivity(@Param("startDate") LocalDate startDate, @Param("endDate")LocalDate endDate);
/**
* 作废的异常的
* @return
*/
void deleteErrorBir();
} }

4
src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java

@ -12,6 +12,7 @@ import com.qs.serve.modules.bir.entity.BirRemoveId;
import com.qs.serve.modules.bir.entity.dto.BirCenterGoodSplitDTO; import com.qs.serve.modules.bir.entity.dto.BirCenterGoodSplitDTO;
import com.qs.serve.modules.bir.entity.so.BirMonthCusCenterSo; import com.qs.serve.modules.bir.entity.so.BirMonthCusCenterSo;
import com.qs.serve.modules.bir.entity.vo.BirActivityCenterGoodsMonthVo; import com.qs.serve.modules.bir.entity.vo.BirActivityCenterGoodsMonthVo;
import com.qs.serve.modules.bir.mapper.BirBaseActivityMapper;
import com.qs.serve.modules.bir.mapper.BirRemoveIdMapper; import com.qs.serve.modules.bir.mapper.BirRemoveIdMapper;
import com.qs.serve.modules.bms.entity.BmsCostCenter; import com.qs.serve.modules.bms.entity.BmsCostCenter;
import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.BmsRegion;
@ -73,6 +74,8 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
private final TbsActivityCenterGoodsMapper tbsActivityCenterGoodsMapper; private final TbsActivityCenterGoodsMapper tbsActivityCenterGoodsMapper;
private final BirBaseActivityMapper birBaseActivityMapper;
private final BmsSupplierMapper bmsSupplierMapper; private final BmsSupplierMapper bmsSupplierMapper;
private final BirRemoveIdMapper birRemoveIdMapper; private final BirRemoveIdMapper birRemoveIdMapper;
@ -87,6 +90,7 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
List<TbsActivityCenterGoods> activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null); List<TbsActivityCenterGoods> activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null);
//异常状态的费用申请,导致的Bir //异常状态的费用申请,导致的Bir
birBaseActivityMapper.deleteErrorBir();
List<BirActivityCenterGoods> removeErrorBirList = this.baseMapper.selectErrorBir(); List<BirActivityCenterGoods> removeErrorBirList = this.baseMapper.selectErrorBir();
List<Long> errorActIds = removeErrorBirList.stream().map(BirActivityCenterGoods::getActivityId).distinct().collect(Collectors.toList()); List<Long> errorActIds = removeErrorBirList.stream().map(BirActivityCenterGoods::getActivityId).distinct().collect(Collectors.toList());
this.buildRemoveRecode(errorActIds); this.buildRemoveRecode(errorActIds);

25
src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java

@ -35,10 +35,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -89,7 +86,7 @@ public class BmsChannelPointController {
} }
if(param.getExportNum() != null && param.getExportNum()!= 0 if(param.getExportNum() != null && param.getExportNum()!= 0
&& param.getStartNum() != null && param.getStartNum()!= 0){ && param.getStartNum() != null ){
lqw.last(" limit "+param.getStartNum() + "," + param.getExportNum()); lqw.last(" limit "+param.getStartNum() + "," + param.getExportNum());
} }
@ -337,9 +334,9 @@ public class BmsChannelPointController {
} }
}); });
List<BmsChannelPoint4ExcelBo> saveList = param.stream().filter(a->a.getType().equals("1")).collect(Collectors.toList()); List<BmsChannelPoint4ExcelBo> saveList = param.stream().filter(a-> "1".equals(a.getType())).collect(Collectors.toList());
List<BmsChannelPoint4ExcelBo> updateList = param.stream().filter(a->a.getType().equals("2")).collect(Collectors.toList()); List<BmsChannelPoint4ExcelBo> updateList = param.stream().filter(a-> "2".equals(a.getType())).collect(Collectors.toList());
List<BmsChannelPoint4ExcelBo> deleteList = param.stream().filter(a->a.getType().equals("3")).collect(Collectors.toList()); List<BmsChannelPoint4ExcelBo> deleteList = param.stream().filter(a-> "3".equals(a.getType())).collect(Collectors.toList());
/** ------------------------------- 查渠道列表 ------------------------------------------------ */ /** ------------------------------- 查渠道列表 ------------------------------------------------ */
List<String> channelCodes = new ArrayList<>(); List<String> channelCodes = new ArrayList<>();
@ -363,12 +360,16 @@ public class BmsChannelPointController {
}); });
} }
} }
Map<String,BmsChannel> codeToChannaledId = channelList.stream().collect(Collectors.toMap(BmsChannel::getChannelCode, a->a)); //有重复的key这个方法会报错
//Map<String,BmsChannel> codeToChannaledId = channelList.stream().collect(Collectors.toMap(BmsChannel::getChannelCode, a->a));
Map<String,BmsChannel> codeToChannaledId = channelList.stream()
.filter(a->a.getChannelCode()!=null)
.collect(Collectors.toMap(BmsChannel::getChannelCode, p -> p, (o, n) -> n));
/** ----------------------------------------------------------------------------------- */ /** ----------------------------------------------------------------------------------- */
/** ------------------------------- 查行政区域列表 ------------------------------------------------ */ /** ------------------------------- 查行政区域列表 ------------------------------------------------ */
List<String> bizRegionCodes = new ArrayList<>(); List<String> bizRegionCodes = new ArrayList<>();
bizRegionCodes.addAll(saveList.stream().filter(a->a.getBizRegionCode()!=null).map(a->a.getBizRegionCode()).collect(Collectors.toList())); bizRegionCodes.addAll(saveList.stream().map(BmsChannelPoint4ExcelBo::getBizRegionCode).filter(Objects::nonNull).collect(Collectors.toList()));
bizRegionCodes.addAll(updateList.stream().filter(a->a.getBizRegionCode()!=null).map(a->a.getBizRegionCode()).collect(Collectors.toList())); bizRegionCodes.addAll(updateList.stream().map(BmsChannelPoint4ExcelBo::getBizRegionCode).filter(Objects::nonNull).collect(Collectors.toList()));
bizRegionCodes = bizRegionCodes.stream().distinct().collect(Collectors.toList()); bizRegionCodes = bizRegionCodes.stream().distinct().collect(Collectors.toList());
List<BmsRegion2> region2List = new ArrayList<>(); List<BmsRegion2> region2List = new ArrayList<>();
if(bizRegionCodes.size()>0){ if(bizRegionCodes.size()>0){
@ -463,7 +464,7 @@ public class BmsChannelPointController {
/** ----------------------------------------------------------------------------------- */ /** ----------------------------------------------------------------------------------- */
/** ------------------------------- 返回错误 ------------------------------------------- */ /** ------------------------------- 返回错误 ------------------------------------------- */
if(param.stream().filter(a->a.getErrorInfo().length()>0).count()>0) { if(param.stream().filter(a->a.getErrorInfo()!=null&&a.getErrorInfo().length()>0).count()>0) {
return R.ok(param, "导入失败,请打开EXCEL查询错误详情!"); return R.ok(param, "导入失败,请打开EXCEL查询错误详情!");
} }

3
src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java

@ -178,6 +178,9 @@ public class TbsCostApply implements Serializable {
/** 统计所有活动使用的金额 */ /** 统计所有活动使用的金额 */
private BigDecimal totalActivityUsedAmount; private BigDecimal totalActivityUsedAmount;
/** 政策项ID */
private Long policyItemId;
/** 模板id */ /** 模板id */
private Long templateId; private Long templateId;

5
src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

@ -257,16 +257,12 @@ public class PortalOfCostApplication {
List<GoodsSku> skuList = this.initSkuListOfProcess(invCodes); List<GoodsSku> skuList = this.initSkuListOfProcess(invCodes);
//常用参数 //常用参数
final String GOODS_TYPE = "sku"; final String GOODS_TYPE = "sku";
final String CENTER_TYPE = "customer";
final BigDecimal OneHundred = new BigDecimal("100"); final BigDecimal OneHundred = new BigDecimal("100");
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
LocalDate nowDate = LocalDate.now(); LocalDate nowDate = LocalDate.now();
Date nowDate_ = new Date();
String erpCode = createBo.getErpCode();
Long supplierId = Long.parseLong(supplier.getId()); Long supplierId = Long.parseLong(supplier.getId());
BigDecimal totalAmount = createBo.getTotalAmount(); BigDecimal totalAmount = createBo.getTotalAmount();
String costTheme = createBo.getCostTheme(); String costTheme = createBo.getCostTheme();
String random = String.format("%03d",new Random().nextInt(999));
String costApplyCode = "CA"+CodeGenUtil.generate(CodeGenUtil.SourceKey.CostApply); String costApplyCode = "CA"+CodeGenUtil.generate(CodeGenUtil.SourceKey.CostApply);
String activityCode = costApplyCode + "_1"; String activityCode = costApplyCode + "_1";
String activityTitle = "由政策"+policyItem.getPolicyItemCode()+"核销一站式API生成的活动"; String activityTitle = "由政策"+policyItem.getPolicyItemCode()+"核销一站式API生成的活动";
@ -284,6 +280,7 @@ public class PortalOfCostApplication {
costApply.setTotalActivity(1); costApply.setTotalActivity(1);
costApply.setTotalActivityAmount(totalAmount); costApply.setTotalActivityAmount(totalAmount);
costApply.setTotalActivityUsedAmount(totalAmount); costApply.setTotalActivityUsedAmount(totalAmount);
costApply.setPolicyItemId(policyItem.getId());
//构建活动 //构建活动
TbsActivity activity = new TbsActivity(); TbsActivity activity = new TbsActivity();
activity.setActivityCode(activityCode); activity.setActivityCode(activityCode);

7
src/main/resources/mapper/bir/BirBaseActivityMapper.xml

@ -109,5 +109,12 @@
) )
</select> </select>
<select id="deleteErrorBir" >
update bir_base_activity
left join tbs_cost_apply
on tbs_cost_apply.id = bir_base_activity.cost_apply_id
set bir_base_activity.del_flag = '1'
where charge_state not in (2,3)
</select>
</mapper> </mapper>

Loading…
Cancel
Save