订单调整；费用核销交接查询

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<HisUserSupplier> 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<String> 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);
+        }
+    }
+
 }
 

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("取消订单失败");
     }

src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java

@@ -52,6 +52,8 @@ public interface OmsOrderService extends IService<OmsOrder> {
      */
     boolean checkMsOrderStatus(OmsOrder order);
 
+    boolean cancelOrder(String orderSn);
+
     /**
      * 创建订单 PC
      * @param omsOrderBo

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.*;
-import static com.qs.serve.modules.tbs.common.TbsSeeYonConst.ERP_ORDER_STATUS;
 
 /**
  * 订单 服务实现类
@@ -546,6 +545,15 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> 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<OmsOrderItem> list) {
         List<ErpOfferOrderParam.InventoryItem> inventoryItemList = new ArrayList<>();
         for (OmsOrderItem orderItem : list) {

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";

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;
 

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;
 

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);

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -123,9 +123,16 @@ public class VtbVerificationController {
             List<String> 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());

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;

src/main/resources/mapper/goods/GoodsSpuMapper.xml

@@ -95,18 +95,18 @@
                 </foreach>
             </if>
             <if test="query.selectCateIds!=null and query.selectCateIds.size > 0">
-                and `goods_spu`.`category_first` in
+                and (`goods_spu`.`category_first` in
-                <foreach collection="query.selectCateIds" item ="selectId" index="i" open="(" close=")" separator=",">
+                <foreach collection="query.selectCateIds" item="selectId" index="i" open="(" close=")" separator=",">
                     #{selectId}
                 </foreach>
                 or `goods_spu`.`category_second` in
-                <foreach collection="query.selectCateIds" item ="selectId" index="i" open="(" close=")" separator=",">
+                <foreach collection="query.selectCateIds" item="selectId" index="i" open="(" close=")" separator=",">
                     #{selectId}
                 </foreach>
                 or `goods_spu`.`category_third` in
-                <foreach collection="query.selectCateIds" item ="selectId" index="i" open="(" close=")" separator=",">
+                <foreach collection="query.selectCateIds" item="selectId" index="i" open="(" close=")" separator=",">
                     #{selectId}
-                </foreach>
+                </foreach>)
             </if>
         </where>
     </select>

src/main/resources/mapper/tbs/TbsCostApplyMapper.xml

@@ -116,10 +116,14 @@
             <include refid="baseWhere4CostApply"/>
         </if>
         <if test="query.selectUserIds!=null and query.selectUserIds.size > 0">
-            and `tbs_cost_apply`.`user_id` in
+            and ( `tbs_cost_apply`.`user_id` in
-            <foreach collection="query.selectUserIds" item ="selectId" index="i" open="(" close=")" separator=",">
+            <foreach collection="query.selectUserIds" item="selectId" index="i" open="(" close=")" separator=",">
                 #{selectId}
             </foreach>
+            or `tbs_cost_apply`.`ext_user_id` in
+            <foreach collection="query.selectUserIds" item="selectId" index="i" open="(" close=")" separator=",">
+                #{selectId}
+            </foreach> )
         </if>
         order by tbs_cost_apply.`create_time` DESC