Browse Source

feat:随货生成费用支持删除;修复BIR本地化导致费用核销关联数据异常

checkBack
Yen 1 year ago
parent
commit
05fab0a434
  1. 3
      src/main/java/com/qs/serve/common/util/BirHttpUtil.java
  2. 9
      src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java
  3. 4
      src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java
  4. 2
      src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java
  5. 2
      src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java
  6. 5
      src/main/java/com/qs/serve/modules/third/entity/ProcessCreatePolicyCostBo.java
  7. 20
      src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

3
src/main/java/com/qs/serve/common/util/BirHttpUtil.java

@ -102,7 +102,8 @@ public class BirHttpUtil {
map.put("centerName",centerName);
map.put("supplierCode",supplierCode);
R<?> result = get("/bir/roiRate/getCostCenter",map);
return JsonUtil.jsonToPojo(result.getData().toString(),TbsCostSubItem.CostCenterTranStr.class);
String json = result.getData().toString();
return JsonUtil.jsonToPojo(json,TbsCostSubItem.CostCenterTranStr.class);
}
}

9
src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java

@ -74,7 +74,14 @@ public class BirActivityCenterGoodsController {
return R.ok();
}
@GetMapping("/toSyncBirbyCode")
public R<?> toSyncBirEcro(String costCode){
List<TbsCostApply> list = tbsCostApplyService.list(new LambdaQueryWrapper<TbsCostApply>().eq(TbsCostApply::getCode,costCode));
for (TbsCostApply costApply : list) {
centerGoodsService.rebuildBir(Arrays.asList(costApply.getId()));
}
return R.ok();
}
@GetMapping("/toSyncBirEcro")
public R<?> toSyncBirEcro(){

4
src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java

@ -64,11 +64,11 @@ public class BirRoiRateController {
* @param id
* @return
*/
//@GetMapping("/testCostCenter")
@GetMapping("/testCostCenter")
public R<?> buildCostCenter(String id){
TbsActivityCenter tbsActivityCenter = tbsActivityCenterMapper.selectById(id);
TbsActivity activity = tbsActivityMapper.selectById(tbsActivityCenter.getActivityId());
return R.ok(birCenterRateService.buildCostCenter(tbsActivityCenter.getCenterType(),
return R.ok(BirHttpUtil.buildCostCenter(tbsActivityCenter.getCenterType(),
tbsActivityCenter.getCenterId(),
tbsActivityCenter.getCenterName(),
activity.getSupplierCode()));

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

@ -46,6 +46,8 @@ public class TbsCostApply implements Serializable {
@TableField(condition = SqlCondition.LIKE)
private String chargeTheme;
private String recId;
/** 客户id */
@NotNull(message = "客户id不能为空")
private Long supplierId;

2
src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java

@ -2,6 +2,7 @@ package com.qs.serve.modules.tbs.entity.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
@ -99,6 +100,7 @@ public class TbsCostSubItem {
}
@Data
@NoArgsConstructor
public static class CostCenterTranStr{
public CostCenterTranStr(String chengBenZhongXin, String chengBenZhongXinId) {
this.chengBenZhongXin = chengBenZhongXin;

5
src/main/java/com/qs/serve/modules/third/entity/ProcessCreatePolicyCostBo.java

@ -49,4 +49,9 @@ public class ProcessCreatePolicyCostBo {
/** 拓展:是否保存支付到中间库 xlt,0->不保存(默认);1->保存 */
private Integer toSavePaymentFlag;
/**
* 唯一标识
*/
private String recId;
}

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

@ -346,8 +346,28 @@ public class PortalOfCostApplication {
Assert.throwEx("政策预算不足,可用余额:"+surplusAmt);
}
//移除历史记录
List<TbsCostApply> histCostApplyList = costApplyService.list(new LambdaQueryWrapper<TbsCostApply>()
.eq(TbsCostApply::getRecId,createBo.getRecId()));
for (TbsCostApply costApply : histCostApplyList) {
costApplyService.removeById(costApply.getId());
QueryWrapper costqw = new QueryWrapper();
costqw.eq("cost_apply_id",costApply.getId());
activityService.remove(costqw);
activitySubjectService.remove(costqw);
activityCenterService.remove(costqw);
activityGoodsService.remove(costqw);
activityCenterGoodsService.remove(costqw);
budgetLogService.remove(costqw);
costItemService.remove(costqw);
verificationService.remove(costqw);
verificationSubjectService.remove(costqw);
}
//构建费用申请
TbsCostApply costApply = new TbsCostApply();
//标记唯一
costApply.setRecId(createBo.getRecId());
costApply.setBillNumber(billNumber);
costApply.setCode(costApplyCode);
costApply.setChargeTheme(costTheme);

Loading…
Cancel
Save