fix: debug

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -885,6 +885,21 @@ public class BmsSupplierController {
             if(!StringUtils.hasText(a.getSalesRegionName())){
                 a.setErrorInfo(a.getErrorInfo()+"销售区域不能为空;");
             }
+            if(a.getSupplierInfoFlag()==null){
+                a.setErrorInfo(a.getErrorInfo()+"供应商信息是否必填不能空;");
+            }
+            if(a.getSupplierInfoFlag()!=null&&a.getSupplierInfoFlag().equals(1)){
+                if(!StringUtils.hasText(a.getSupplierTaxNumber())){
+                    a.setErrorInfo(a.getErrorInfo()+"税号不能为空;");
+                }
+                if(!StringUtils.hasText(a.getSupplierUser())){
+                    a.setErrorInfo(a.getErrorInfo()+"供应商联系人不能为空;");
+                }
+                if(!StringUtils.hasText(a.getSupplierLicenseImg())){
+                    a.setErrorInfo(a.getErrorInfo()+"营业执照地址不能为空;");
+                }
+            }
+
             if(!StringUtils.hasText(a.getFirstLevelAdministrativeRegionName())){
                 a.setErrorInfo(a.getErrorInfo()+"省不能为空;");
             }

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

@@ -80,6 +80,22 @@ public class BmsSupplierExcelBo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime suspendCooperationDate;
 
+    /** 供应商是否填写信息 */
+    @NotNull(message = "供应商是否填写信息不能为空")
+    private Integer supplierInfoFlag;
+
+    /** 供应商税号 */
+    @Length(max = 255,message = "供应商税号长度不能超过255字")
+    private String supplierTaxNumber;
+
+    /** 供应商联系人 */
+    @Length(max = 255,message = "供应商联系人长度不能超过255字")
+    private String supplierUser;
+
+    /** 营业执照地址 */
+    @Length(max = 255,message = "营业执照地址长度不能超过255字")
+    private String supplierLicenseImg;
+
     // 创建时间
     private LocalDateTime createTime;
 

src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@@ -696,8 +696,12 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
             xltOrderItem.setSpuCode(orderItem.getSpuCode());
             boolean eq = orderItem.getSkuCode().equals(orderItem.getSpuCode());
             if(!StringUtils.hasText(orderItem.getSkuCode())||eq){
+                GoodsSku sku = goodsSkuService.getById(orderItem.getSkuId());
+                GoodsSpu spu = goodsSpuService.getById(orderItem.getSpuId());
+                if(!sku.getSkuCode().equals(spu.getSpuCode())){
                     Assert.throwEx("SKU【"+orderItem.getSpuCode()+"】存货缺失，请联系档案负责人");
                 }
+            }
             xltOrderItem.setChanPinBianHao(orderItem.getSkuCode());
             xltOrderItem.setChanPinDanWei(orderItem.getSkuUnit());
             xltOrderItem.setDingHuoShuLiang(orderItem.getQuantity());

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -357,6 +357,7 @@ public class SysUserController {
         }
         param.setServingState(0);
         param.setId("SU"+IdUtil.getSnowFlakeId());
+        param.setServingState(1);
         boolean result = sysUserService.save(param);
 //        if(param.getId()!=null&& com.qs.serve.common.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){
 //            sysRoleService.saveUserRole4Edit(userBo.getRoleIds(),param.getId());

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

@@ -121,7 +121,7 @@ public class TbsCostApplyController {
      * @param id
      * @return
      */
-    @DeleteMapping("/removeCostById/{id}")
+    @PostMapping("/removeCostById/{id}")
     public R<?> removeCostById(@PathVariable("id") Long id){
         tbsCostApplyService.removeCostById(id);
         return R.ok();

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

@@ -377,7 +377,13 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
         }else if(CollectionUtil.isNotEmpty(activityBo.getActivityPointList())){
             for (TbsActivityChannelPointBo activityChannelPointBo : activityBo.getActivityPointList()) {
                 BmsChannelPoint channelPoint = channelPointService.getById(activityChannelPointBo.getPointId());
+                if(channelPoint==null){
+                    Assert.throwEx("部分网点不存在或已停用");
+                }
                 BmsChannel channel = channelService.getById(channelPoint.getChannelId());
+                if(channel==null){
+                    Assert.throwEx("渠道["+channelPoint.getChannelCode()+"]不存在或已停用");
+                }
                 TbsActivityChannelPoint activityChannelPoint = new TbsActivityChannelPoint();
                 activityChannelPoint.setCostApplyId(costApply.getId());
                 activityChannelPoint.setActivityId(activity.getId());

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

@@ -515,6 +515,16 @@ public class VtbVerificationController {
         return R.ok();
     }
 
+    //@GetMapping("/toPayDev")
+    public R<?> toPayDev(){
+        Long[] ids = new Long[]{
+
+        };
+        for (Long id : ids) {
+            vtbVerificationService.toPayRequest(id);
+        }
+        return R.ok();
+    }
 
 //    @GetMapping("delCaPay")
 //    public R<?> delCaPay(){

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

@@ -110,8 +110,8 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi
             tbsActivityService.updateById(activity);
         }
         TbsActivity tbsActivity = tbsActivityService.getById(verification.getActivityId());
-        if(tbsActivity.getCurrVerificationId()!=null && tbsActivity.getCurrVerificationId().equals(verification.getId().toString())&&
+        //if(tbsActivity.getCurrVerificationId()!=null && tbsActivity.getCurrVerificationId().equals(verification.getId().toString())&&
-        //if(
+        if(
                 tbsActivity.getActivityState().equals(TbsActivityState.STATE_1_Checking)){
             //还原活动为待核销状态
             TbsActivity activity = new TbsActivity();