diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java index f8974650..ed3e9ac4 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java @@ -111,6 +111,13 @@ public class BmsSupplier implements Serializable { /** 闭户 */ private Integer stopFlag; + /** + * CD订单 + * 0-> 非必填 + * 1-> 下单时必须填写CD订单信息 + */ + private Integer cdOrderFlag; + /** 闭户日期 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java index 552e3d4e..fa93d907 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java @@ -67,6 +67,13 @@ public class BmsSupplierExcelBo { // 闭户状态 private Integer closeAccountStatus; + /** + * CD订单 + * 0-> 非必填 + * 1-> 下单时必须填写CD订单信息 + */ + private Integer cdOrderFlag; + // 闭户日期 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @@ -114,6 +121,7 @@ public class BmsSupplierExcelBo { bo.setSupplierTaxNumber(bmsSupplier.getSupplierTaxNumber()); bo.setSupplierUser(bmsSupplier.getSupplierUser()); bo.setSupplierLicenseImg(bmsSupplier.getSupplierLicenseImg()); + bo.setCdOrderFlag(bmsSupplier.getCdOrderFlag()); if(bmsSupplier.getRegionFirstInfo()!=null) { BmsRegion firstRegion = (BmsRegion)bmsSupplier.getRegionFirstInfo(); bo.setFirstLevelSalesRegionName(firstRegion.getName()); diff --git a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java index 0b508fc7..30f69cae 100644 --- a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java +++ b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java @@ -37,7 +37,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import static com.qs.serve.modules.tbs.common.TbsSeeYonConst.ERP_ORDER_STATUS; @@ -155,13 +157,30 @@ public class OmsOrderApi { orderWrapper.eq(OmsOrder::getUserId,AuthContextUtils.getSysUserId()); orderWrapper.orderByDesc(OmsOrder::getId); List list = omsOrderService.list(orderWrapper); + + List userIds = list.stream().map(OmsOrder::getCheckUserId).collect(Collectors.toList()); + List sysUserList = new ArrayList<>(); + if(userIds.size()>0){ + sysUserList = sysUserService.listByIds(userIds); + } + + List addrIds = list.stream().map(OmsOrder::getSupplierAddrId).collect(Collectors.toList()); + addrIds.add(0L); + List supplierAddressList = bmsSupplierAddressService.listByIds(addrIds); + for (OmsOrder order : list) { omsOrderService.checkMsOrderStatus(order); - BmsSupplierAddress supplierAddress = bmsSupplierAddressService.getById(order.getSupplierAddrId()); - order.setAddressInfo(supplierAddress); - SysUser sysUser = sysUserService.getById(order.getCheckUserId()); - if(sysUser!=null){ - order.setCheckUserInfo(sysUser.toSysUserVo()); + + for (BmsSupplierAddress address : supplierAddressList) { + if(order.getSupplierAddrId().equals(address.getId())){ + order.setAddressInfo(address); + } + } + + for (SysUser user : sysUserList) { + if(user.getId().equals(order.getCheckUserId())){ + order.setCheckUserInfo(user.toSysUserVo()); + } } LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java index dc3c45a7..c2afcc61 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java @@ -343,15 +343,15 @@ public class OmsOrderServiceImpl extends ServiceImpl im } //拦截商品授权维度规则 - if(supplier!=null){ - GoodsAccrIdsDto accrIdsDto = goodsAccreditService.listIgnoreAcc2(supplier.getId(),supplier.listBizRegionIds(),supplier.listSaleRegionIds()); + GoodsAccrIdsDto accrIdsDto = goodsAccreditService.listIgnoreAcc2(supplier.getId(),supplier.listBizRegionIds(),supplier.listSaleRegionIds()); + if(accrIdsDto!=null){ List skuIds = goodsSkuMapper.listByOtherIds( - accrIdsDto.getCateIds(), - accrIdsDto.getSpuIds(), - accrIdsDto.getSkuIds(), - accrIdsDto.getNotInCateIds(), - accrIdsDto.getNotInSpuIds(), - accrIdsDto.getNotInSkuIds() + accrIdsDto.getCateIds(), + accrIdsDto.getSpuIds(), + accrIdsDto.getSkuIds(), + accrIdsDto.getNotInCateIds(), + accrIdsDto.getNotInSpuIds(), + accrIdsDto.getNotInSkuIds() ); for (OmsOrderItem orderItem : newOrderItemList) { for (Long skuId : skuIds) { diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java index 31eff7aa..5d885359 100644 --- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java +++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java @@ -130,5 +130,18 @@ public interface TbsBudgetMapper extends BaseMapper { "GROUP BY tbs_budget.id ") List selectExpireBudgetId(); + + @InterceptorIgnore(tenantLine = "true") + @Select("update " + + " tbs_budget " + + " LEFT JOIN `tbs_budget_condition` ON tbs_budget.id = tbs_budget_condition.budget_id " + + " set tbs_budget.condition_flag = 1 " + + "WHERE " + + " tbs_budget.condition_flag = 0 " + + " AND tbs_budget_condition.id IS NOT NULL " + + " and tbs_budget_condition.del_flag = 0 " + + " and tbs_budget.del_flag = 0") + List updateConFlag(); + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java index 9118e693..49feedc9 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java @@ -100,8 +100,8 @@ public class TbsBudgetApplyOperationServiceImpl implements SeeYonOperationServic budgetLogList.add(budgetLog); } budgetLogService.saveBatch(budgetLogList); - } + budgetMapper.updateConFlag(); return null; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchOperationServiceImpl.java index 945c3ff7..199f7da1 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchOperationServiceImpl.java @@ -10,6 +10,7 @@ import com.qs.serve.modules.tbs.entity.TbsBudget; import com.qs.serve.modules.tbs.entity.TbsBudgetBatch; import com.qs.serve.modules.tbs.entity.TbsBudgetBatchItem; import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo; +import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper; import com.qs.serve.modules.tbs.service.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -28,6 +29,7 @@ import java.util.List; @AllArgsConstructor public class TbsBudgetBatchOperationServiceImpl implements SeeYonOperationService { + private final TbsBudgetMapper tbsBudgetMapper; private final TbsBudgetBatchService budgetBatchService; private final TbsBudgetBatchItemService budgetBatchItemService; private final TbsBudgetService tbsBudgetService; @@ -78,6 +80,7 @@ public class TbsBudgetBatchOperationServiceImpl implements SeeYonOperationServic budgetBatch.setBatchState(TbsCommonCheckState.State_2_finished); budgetBatch.setFinishedTime(LocalDateTime.now()); budgetBatchService.updateById(budgetBatch); + tbsBudgetMapper.updateConFlag(); return null; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java index b8c22977..d39290fa 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java @@ -141,6 +141,7 @@ public class TbsBudgetChangeOperationServiceImpl implements SeeYonOperationServi } } } + budgetMapper.updateConFlag(); } /** diff --git a/src/main/resources/mapper/bms/BmsSupplierMapper.xml b/src/main/resources/mapper/bms/BmsSupplierMapper.xml index 01bf60c3..8a458171 100644 --- a/src/main/resources/mapper/bms/BmsSupplierMapper.xml +++ b/src/main/resources/mapper/bms/BmsSupplierMapper.xml @@ -81,6 +81,7 @@ bms_supplier.`cooperate_pause_flag`, bms_supplier.`stop_flag_date`, bms_supplier.`cooperate_pause_flag_date`, + bms_supplier.`cd_order_flag`, bms_supplier.`del_flag`