From 2fb2a9de48c315f4a0b98d4521248b599e69d175 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 27 Oct 2023 10:22:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B0=83=E6=95=B4=EF=BC=9B?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=A0=B8=E9=94=80=E4=BA=A4=E6=8E=A5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/controller/BmsSupplierController.java | 46 +++++++++++++++++++ .../oms/controller/api/OmsOrderApi.java | 3 ++ .../modules/oms/service/OmsOrderService.java | 2 + .../oms/service/impl/OmsOrderServiceImpl.java | 12 ++++- .../modules/tbs/common/TbsSeeYonConst.java | 1 + .../serve/modules/tbs/entity/TbsActivity.java | 2 + .../modules/tbs/entity/TbsCostApply.java | 7 +++ .../impl/TbsCostApplyPart1ServiceImpl.java | 1 - .../controller/VtbVerificationController.java | 11 ++++- .../modules/vtb/entity/VtbVerification.java | 6 +++ .../resources/mapper/goods/GoodsSpuMapper.xml | 10 ++-- .../mapper/tbs/TbsCostApplyMapper.xml | 8 +++- 12 files changed, 97 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 978d60d5..a1b90ca2 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -41,6 +41,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -321,6 +322,7 @@ public class BmsSupplierController { initSupplierOtherInfo(Arrays.asList(supplier.getId())); //清空临时表 hisUserSupplierService.cleanTable(); + this.saveTOHis(param.getUserIds(), supplier); return R.ok(); } @@ -401,6 +403,12 @@ public class BmsSupplierController { //清空临时表 hisUserSupplierService.cleanTable(); redisService.remove(RedisCacheKeys.SUPPLIER_RELATE_TREE); + //移除客户直属负责人 + LambdaQueryWrapper rmLqw = new LambdaQueryWrapper<>(); + rmLqw.in(HisUserSupplier::getUserId,userIds); + rmLqw.eq(HisUserSupplier::getSupplierId,supplier.getId()); + rmLqw.eq(HisUserSupplier::getType,2); + hisUserSupplierService.remove(rmLqw); return R.ok(); } @@ -440,6 +448,8 @@ public class BmsSupplierController { return R.ok(); } + + /** * 移除主要负责人 * @param supplierId @@ -1238,5 +1248,41 @@ public class BmsSupplierController { return R.ok(); } + + + /** + * 直属负责人，直接添加到his表 + * @param userIds + * @param supplier + */ + private void saveTOHis(List userIds, BmsSupplier supplier) { + //直属负责人，直接添加到his表 + for (String userId : userIds) { + HisUserSupplier hisUserSupplier = new HisUserSupplier(); + hisUserSupplier.setUserId(userId); + hisUserSupplier.setSupplierId(Long.parseLong(supplier.getId())); + hisUserSupplier.setSupplierName(supplier.getName()); + hisUserSupplier.setSupplierCode(supplier.getCode()); + hisUserSupplier.setType(2); + hisUserSupplier.setSaleRegionFirst(supplier.getRegionFirst()); + hisUserSupplier.setSaleRegionSecond(supplier.getRegionSecond()); + hisUserSupplier.setSaleRegionThird(supplier.getRegionThird()); + hisUserSupplier.setSaleRegionFourthly(supplier.getRegionFourthly()); + hisUserSupplier.setMasterFlag(1); + hisUserSupplier.setCreateTime(LocalDateTime.now()); + hisUserSupplier.setBizRegionFirst(supplier.getRegion2First()); + hisUserSupplier.setBizRegionSecond(supplier.getRegion2Second()); + hisUserSupplier.setBizRegionThird(supplier.getRegion2Third()); + hisUserSupplier.setBizRegionFourthly(supplier.getRegion2Fourthly()); + hisUserSupplier.setCostFlag(supplier.getCostFlag()); + hisUserSupplier.setSupplierFlag(supplier.getSupplierFlag()); + hisUserSupplier.setStopFlag(supplier.getStopFlag()); + hisUserSupplier.setStopFlagDate(supplier.getStopFlagDate()); + hisUserSupplier.setCooperatePauseFlag(supplier.getCooperatePauseFlag()); + hisUserSupplier.setCooperatePauseFlagDate(supplier.getCooperatePauseFlagDate()); + hisUserSupplierService.save(hisUserSupplier); + } + } + } 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 d85ba8e5..36b1137a 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 @@ -109,8 +109,11 @@ public class OmsOrderApi { OmsOrder omsOrder = omsOrderService.getById(omsOrderBo.getOrderId()); omsOrderService.checkMsOrderStatus(omsOrder); if(omsOrder.getStatus().equals(1)){ + //去执行取消 + omsOrderService.cancelOrder(omsOrder.getOrderSn()); omsOrder.setStatus(6); omsOrderService.updateById(omsOrder); + return R.ok(); } return R.error("取消订单失败"); } diff --git a/src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java b/src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java index 4546c9c2..c6eb1eb7 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java +++ b/src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java @@ -52,6 +52,8 @@ public interface OmsOrderService extends IService { */ boolean checkMsOrderStatus(OmsOrder order); + boolean cancelOrder(String orderSn); + /** * 创建订单 PC * @param omsOrderBo 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 66dc8a0f..de832e4d 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 @@ -48,8 +48,7 @@ import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; -import static com.qs.serve.modules.tbs.common.TbsSeeYonConst.ERP_ORDER_CREATE; -import static com.qs.serve.modules.tbs.common.TbsSeeYonConst.ERP_ORDER_STATUS; +import static com.qs.serve.modules.tbs.common.TbsSeeYonConst.*; /** * 订单 服务实现类 @@ -546,6 +545,15 @@ public class OmsOrderServiceImpl extends ServiceImpl im return false; } + @Override + public boolean cancelOrder(String orderSn) { + seeYonRequestBaseService.postBase(ERP_ORDER_CANCEL+"/"+orderSn + ,null + ,"获取订单状态" + ); + return false; + } + private void toU8Api(OmsOrder omsOrder, SysUser sysUser, SysDept dept, List list) { List inventoryItemList = new ArrayList<>(); for (OmsOrderItem orderItem : list) { diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java index e25c67a8..d697d78c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java +++ b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java @@ -85,6 +85,7 @@ public interface TbsSeeYonConst { String ERP_CUS_INV_PRICE = "/erp/inventory/invPrices"; String ERP_ORDER_CREATE = "/erp/order/create"; String ERP_ORDER_STATUS = "/erp/order/getStatus"; + String ERP_ORDER_CANCEL = "/erp/order/cancelOrder"; String XLT_SAVE_CHECK = "/xlt/saveCheck"; String XLT_SAVE_PAYMENT = "/xlt/savePayment"; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java index 0b47d81f..08297ac7 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java @@ -200,6 +200,8 @@ public class TbsActivity implements Serializable { /** 是否取消(异动时设置) */ private Integer cancelFlag; + + @TableField(exist = false) private List attachList; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java index c93b03ed..fa30c4ff 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java @@ -214,6 +214,13 @@ public class TbsCostApply implements Serializable { */ private Integer editAmountFlag; + /** + * 业务继承人 + */ + private String extUserId; + private String extUserCode; + private String extUserName; + @TableField(exist = false) private String affairId; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java index df4b3582..b231ac0c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java @@ -72,7 +72,6 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service { costApply.setChangeExtendId(null); costApply.setCancelFlag(null); costApply.setTotalActivityUsedAmount(null); - costApply.setCancelFlag(null); costApply.setEditAmountFlag(null); costApply.setChargeState(TbsCostApplyState.State_0_unPublish.getCode()); costApply.setChangeActionTime(null); diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index a41bc170..cc56d3e4 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -123,9 +123,16 @@ public class VtbVerificationController { List userIds = sysPostUserService.listByChildIds(AuthContextUtils.getSysUserId()); userIds.add(AuthContextUtils.getSysUserId()); if(userIds.size()==1){ - lqw.eq(VtbVerification::getUserId,userIds.get(0)); + lqw.and(qw->{ + qw.eq(VtbVerification::getUserId,userIds.get(0)) + .or().eq(VtbVerification::getExtUserId,userIds.get(0)); + }); + }else { - lqw.in(VtbVerification::getUserId,userIds); + lqw.and(qw->{ + qw.in(VtbVerification::getUserId,userIds) + .or().in(VtbVerification::getExtUserId,userIds); + }); } }else if(loadMy!=null&&loadMy.equals(1)){ lqw.eq(VtbVerification::getUserId,AuthContextUtils.getSysUserId()); diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java index 18f49638..e812632b 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java @@ -183,6 +183,12 @@ public class VtbVerification implements Serializable { @TableField(condition = SqlCondition.LIKE) private String userName; + /** + * 业务继承人 + */ + private String extUserId; + private String extUserCode; + private String extUserName; @TableField(exist = false) private List attachList; diff --git a/src/main/resources/mapper/goods/GoodsSpuMapper.xml b/src/main/resources/mapper/goods/GoodsSpuMapper.xml index bc13c6f6..ae5ac9b0 100644 --- a/src/main/resources/mapper/goods/GoodsSpuMapper.xml +++ b/src/main/resources/mapper/goods/GoodsSpuMapper.xml @@ -95,18 +95,18 @@ - and `goods_spu`.`category_first` in - + and (`goods_spu`.`category_first` in + #{selectId} or `goods_spu`.`category_second` in - + #{selectId} or `goods_spu`.`category_third` in - + #{selectId} - + ) diff --git a/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml b/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml index 4605ac65..06a205da 100644 --- a/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml +++ b/src/main/resources/mapper/tbs/TbsCostApplyMapper.xml @@ -116,10 +116,14 @@ - and `tbs_cost_apply`.`user_id` in - + and ( `tbs_cost_apply`.`user_id` in + #{selectId} + or `tbs_cost_apply`.`ext_user_id` in + + #{selectId} + ) order by tbs_cost_apply.`create_time` DESC