Merge remote-tracking branch 'origin/v1.0' into v1.0

# Conflicts:
#	src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java

src/main/java/com/qs/serve/modules/bms/entity/BmsDutyInfo.java

@@ -39,6 +39,9 @@ public class BmsDutyInfo implements Serializable {
     @Length(max = 255,message = "税号长度不能超过255字")
     private String dutyCode;
 
+    /** 致远的部门id */
+    private String oaDeptId;
+
     /** 是否显示 */
     private Integer showFlag;
 

src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java

@@ -124,7 +124,7 @@ public class BmsSupplierExcelBo {
         if(StringUtils.hasText(bmsSupplier.getOtherUserNames())) {
             bo.setMinorHeadNames(bmsSupplier.getOtherUserNames().replaceAll(",", ";"));
         }
-        if(StringUtils.hasText(bmsSupplier.getOtherUserNames())) {
+        if(StringUtils.hasText(bmsSupplier.getOtherUserCodes())) {
             bo.setMinorHeadCodes(bmsSupplier.getOtherUserCodes().replaceAll(",", ";"));
         }
         bo.setIsExpendableExpense(bmsSupplier.getCostFlag());

src/main/java/com/qs/serve/modules/bms/service/BmsDutyInfoService.java

@@ -10,5 +10,7 @@ import com.qs.serve.modules.bms.entity.BmsDutyInfo;
  */
 public interface BmsDutyInfoService extends IService<BmsDutyInfo> {
 
+    BmsDutyInfo getByDutyNumber(String code);
+
 }
 

src/main/java/com/qs/serve/modules/bms/service/impl/BmsDutyInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.bms.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -18,5 +19,11 @@ import com.qs.serve.modules.bms.mapper.BmsDutyInfoMapper;
 @AllArgsConstructor
 public class BmsDutyInfoServiceImpl extends ServiceImpl<BmsDutyInfoMapper,BmsDutyInfo> implements BmsDutyInfoService {
 
+    @Override
+    public BmsDutyInfo getByDutyNumber(String code) {
+        LambdaQueryWrapper<BmsDutyInfo> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(BmsDutyInfo::getDutyCode,code);
+        return getOne(lqw,false);
+    }
 }
 

src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java

@@ -92,8 +92,24 @@ public class OmsShoppingCartApi {
     public R<?> save(@RequestBody @Valid OmsShoppingCartSaveBo param){
         BmsSupplier supplier = AuthContextUtils.getCurrentSupplier();
         OmsShoppingCart shoppingCart = CopierUtil.copy(param,new OmsShoppingCart());
-        shoppingCart.setUserId(AuthContextUtils.getSysUserId());
         GoodsSku goodsSku = goodsSkuService.getById(shoppingCart.getSkuId());
+        //用于修改sku
+        OmsShoppingCart orgShopCart = omsShoppingCartService.getOne(
+                new LambdaQueryWrapper<OmsShoppingCart>()
+                        .eq(OmsShoppingCart::getSkuCode,goodsSku.getSkuCode())
+                        .ne(param.getCartId()!=null,OmsShoppingCart::getId,param.getCartId())
+                ,false
+        );
+        if(orgShopCart!=null){
+            orgShopCart.setQuantity(orgShopCart.getQuantity()+param.getQuantity());
+            omsShoppingCartService.updateById(orgShopCart);
+            //移除多余
+            omsShoppingCartService.remove(new LambdaQueryWrapper<OmsShoppingCart>()
+                    .eq(OmsShoppingCart::getSkuCode,goodsSku.getSkuCode())
+                    .ne(OmsShoppingCart::getId,param.getCartId()));
+            return R.ok();
+        }
+        shoppingCart.setUserId(AuthContextUtils.getSysUserId());
         GoodsSpu goodsSpu = goodsSpuService.getById(goodsSku.getSpuId());
         if(!goodsSku.getEnable().equals(1)){
             return R.error("商品项["+goodsSku.getSpecInfos()+"]停用中");

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java

@@ -10,6 +10,8 @@ import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.modules.bms.entity.BmsDutyInfo;
+import com.qs.serve.modules.bms.service.BmsDutyInfoService;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.service.SysAttachService;
 import com.qs.serve.modules.tbs.entity.bo.TbsCostContractBo;
@@ -38,6 +40,7 @@ public class TbsCostContractController {
 
     private TbsCostContractService tbsCostContractService;
     private SysAttachService attachService;
+    private BmsDutyInfoService bmsDutyInfoService;
 
     /**
      * 列表
@@ -123,6 +126,10 @@ public class TbsCostContractController {
         contract.setExpireTime(param.getExpireTime());
         contract.setBusinessCompany(param.getBusinessCompany());
         contract.setDutyNumber(param.getDutyNumber());
+        BmsDutyInfo bmsDutyInfo = bmsDutyInfoService.getByDutyNumber(param.getDutyNumber());
+        if(bmsDutyInfo!=null){
+            contract.setOaDeptId(bmsDutyInfo.getOaDeptId());
+        }
         boolean result = tbsCostContractService.updateById(contract);
         return R.isTrue(result);
     }
@@ -157,6 +164,10 @@ public class TbsCostContractController {
             contract.setFileNum(param.getFileNum());
             contract.setBusinessCompany(param.getBusinessCompany());
             contract.setDutyNumber(param.getDutyNumber());
+            BmsDutyInfo bmsDutyInfo = bmsDutyInfoService.getByDutyNumber(param.getDutyNumber());
+            if(bmsDutyInfo!=null){
+                contract.setOaDeptId(bmsDutyInfo.getOaDeptId());
+            }
         }
         if(contract.getId()==null){
             tbsCostContractService.save(contract);

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

@@ -68,6 +68,22 @@ public class TbsCostApply implements Serializable {
     @NotNull(message = "状态不能为空")
     private Integer chargeState;
 
+    /**
+     * 核销状态：
+     * 有这四个状态：
+     * 0-未核销：代表这案子里面的所有活动都还未开始核销；
+     * 1-已通过：代表这个案子的所有活动都已经核销完成；
+     * 2-核销中：代表这个案子的某些活动在核销中；
+     * 3-被拒绝；代表这个案子里面的所有活动金额都被释放了
+     */
+    private Integer checkState;
+
+    /**
+     * 记录核销状态
+     * 用于记录核销前状态
+     */
+    //private Integer logCheckState;
+
     /** 备注 */
     @Length(max = 255,message = "备注长度不能超过255字")
     private String remark;
@@ -229,5 +245,6 @@ public class TbsCostApply implements Serializable {
     @TableField(exist = false)
     List<String> selectUserIds;
 
+
 }
 

src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java

@@ -73,6 +73,9 @@ public class TbsCostContract implements Serializable {
     /** 税号 */
     private String dutyNumber;
 
+    /** 致远的部门id */
+    private String oaDeptId;
+
     /** 创建时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java

@@ -94,5 +94,15 @@ public class TbsCostApplyVo implements Serializable {
 
     private String templateTitle;
 
+    /**
+     * 核销状态：
+     * 有这四个状态：
+     * 0-未核销：代表这案子里面的所有活动都还未开始核销；
+     * 1-已通过：代表这个案子的所有活动都已经核销完成；
+     * 2-核销中：代表这个案子的某些活动在核销中；
+     * 3-被拒绝；代表这个案子里面的所有活动金额都被释放了
+     */
+    private Integer checkState;
+
 }
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -889,18 +889,22 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
 
     @Override
     public void flushCostStatus(Long costApplyId,boolean isContractFlag) {
+        LambdaQueryWrapper<TbsActivity> actLqw = new LambdaQueryWrapper<>();
+        actLqw.eq(TbsActivity::getCostApplyId,costApplyId);
+        List<TbsActivity> activityList = tbsActivityMapper.selectList(actLqw);
         if(isContractFlag){
             LambdaQueryWrapper<TbsActivityPayCondition> lqw = new LambdaQueryWrapper<>();
             lqw.eq(TbsActivityPayCondition::getCostApplyId,costApplyId);
             lqw.ne(TbsActivityPayCondition::getFinishedFlag,1);
             Long count = tbsActivityPayConditionMapper.selectCount(lqw);
             if (count>0){
+                TbsCostApply costApply = new TbsCostApply();
+                costApply.setId(costApplyId);
+                costApply.setCheckState(2);
+                this.updateById(costApply);
                 return;
             }
         }else {
-            LambdaQueryWrapper<TbsActivity> actLqw = new LambdaQueryWrapper<>();
-            actLqw.eq(TbsActivity::getCostApplyId,costApplyId);
-            List<TbsActivity> activityList = tbsActivityMapper.selectList(actLqw);
             for (TbsActivity activity : activityList) {
                 if(activity.getActivityState().equals(TbsActivityState.STATE_4_Release)){
                         continue;
@@ -908,12 +912,32 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                 if(activity.getActivityState().equals(TbsActivityState.STATE_1_Finished)){
                     continue;
                 }
+                TbsCostApply costApply = new TbsCostApply();
+                costApply.setId(costApplyId);
+                costApply.setCheckState(2);
+                this.updateById(costApply);
                 return;
             }
         }
+        boolean isAllCancel = true;
+        for (TbsActivity activity : activityList) {
+            boolean itemCancel = activity.getReleaseFlag().equals(1)
+                    && activity.getReleaseAmount()!=null
+                    && activity.getReleaseAmount().compareTo(activity.getTotalAmount())==0;
+            if(!itemCancel){
+                isAllCancel = false;
+                break;
+            }
+        }
+
         TbsCostApply costApply = new TbsCostApply();
         costApply.setId(costApplyId);
         costApply.setChargeState(TbsCostApplyState.State_3_finished.getCode());
+        if(isAllCancel){
+            costApply.setCheckState(3);
+        }else {
+            costApply.setCheckState(1);
+        }
         costApply.setPassTime(LocalDateTime.now());
         this.updateById(costApply);
     }

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -713,7 +713,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             orgData.setVerificationState(VtbVerificationState.Close.getCode());
             this.updateById(orgData);
         }
-
+//        //记录核销状态到费用申请
+//        costApply.setLogCheckState(costApply.getCheckState());
+//        costApplyService.updateById(costApply);
         //判断是否直接跳过审批的申请
         AsyncManager.me().execute(AsyncFactory.saveVtbSubmit(verification.getId(), totalAmount,1,false));