debug

src/main/java/com/qs/serve/modules/biz/service/impl/BizAppLogServiceImpl.java

@@ -1,6 +1,7 @@
 package com.qs.serve.modules.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.util.AuthContextUtils;

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

@@ -55,9 +55,9 @@ public class BmsRegion2ServiceImpl extends ServiceImpl<BmsRegion2Mapper,BmsRegio
         BmsRegion2 ori = this.getById(param.getId());
         param = this.toSetLevel(param);
         boolean changePid = !ori.getPid().equals(param.getPid());
-//        if(changePid){
+        if(changePid){
-//            Assert.throwEx("当前版本限制上下级变更");
+            Assert.throwEx("当前版本限制上下级变更");
-//        }
+        }
         boolean b = updateById(param);
         if(!ori.getName().equals(param.getName())||changePid) {
             BmsRegion2 parentRegion = this.updatePathByPid(param.getId());

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

@@ -59,9 +59,9 @@ public class BmsRegionServiceImpl extends ServiceImpl<BmsRegionMapper,BmsRegion>
         BmsRegion ori = this.getById(param.getId());
         param = this.flushSetLevel(param);
         boolean changePid = !ori.getPid().equals(param.getPid());
-//        if(changePid){
+        if(changePid){
-//            Assert.throwEx("当前版本限制上下级变更");
+            Assert.throwEx("当前版本限制上下级变更");
-//        }
+        }
         boolean b = this.updateById(param);
         if(!ori.getName().equals(param.getName())||changePid) {
             BmsRegion parentRegion = this.updatePathByPid(param.getId());

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

@@ -82,8 +82,8 @@ public class BmsSupplierApplicationService {
             newRegionCode = bmsRegion2.getCode();
             newRegionName = bmsRegion2.getName();
         }
-        this.migrateActivityBudget(supplierId, regionType, orgRegionId, newRegionId, nowTime, newRegionCode, newRegionName);
+        //this.migrateActivityBudget(supplierId, regionType, orgRegionId, newRegionId, nowTime, newRegionCode, newRegionName);
-        this.migratePolicyBudget(supplierId, regionType, orgRegionId, newRegionId, nowTime, newRegionCode, newRegionName);
+        //this.migratePolicyBudget(supplierId, regionType, orgRegionId, newRegionId, nowTime, newRegionCode, newRegionName);
     }
 
     /**

src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java

@@ -199,8 +199,8 @@ public interface SeeYonOperationService extends SeeYonBaseService{
      */
     default R<Long> getUnfinished(){
         SysUser sysUser = getUserMapper().selectById(AuthContextUtils.getSysUserId());
-        if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){
+        if(StringUtils.hasText(sysUser.getSyUserId())&&StringUtils.hasText(sysUser.getSyAccount())){
-            return getRequestService().getUnfinishedAffair(getTemplateCode(), sysUser.getSyAccount());
+            return getRequestService().getUnfinishedAffair(getTemplateCode(), sysUser.getSyUserId());
         }
         return R.ok(0L);
     }

src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestServiceImpl.java

@@ -182,7 +182,7 @@ public class SeeYonRequestServiceImpl implements SeeYonRequestService {
         R<String> result = seeYonRequestBaseService.postBase(TbsSeeYonConst.API_COUNT_NOT_OK,param,title);
         if(result.getStatus()==200){
             try {
-                R.ok(Long.parseLong(result.getData()));
+                return R.ok(Long.parseLong(result.getData()));
             } catch (NumberFormatException e) {
                 log.error(title+" param==>{} \n ==> {}",JsonUtil.objectToJson(param),JsonUtil.objectToJson(result));
             }

src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java

@@ -163,6 +163,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             authorCodes.add(sysRolePermit.getCode());
         }
         menuIds = sysMenuMapper.searchUserMenuIds(sysUser.getId());
+        if(defaultRoleIds.size()<1){
+            Assert.throwEx("请刷新页面");
+        }
         List<String> defaultRoleMenuIds = sysMenuMapper.searchDefaultMenuIds(defaultRoleIds);
         menuIds.addAll(defaultRoleMenuIds);
 

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

@@ -10,10 +10,7 @@ import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.modules.bms.entity.BmsRegion;
+import com.qs.serve.modules.bms.entity.*;
-import com.qs.serve.modules.bms.entity.BmsSubject;
-import com.qs.serve.modules.bms.entity.BmsSubjectForm;
-import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.*;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
 import com.qs.serve.modules.goods.entity.GoodsSku;
@@ -353,6 +350,7 @@ public class TbsActivityController {
         Long supplierId = defaultCenterBo.getSupplierId();
         BmsSupplier supplier = bmsSupplierService.getById(supplierId);
         List<TbsBudget> centerBudgetList = new ArrayList<>();
+        //[产品List空] 或[科目ID空] ，返回[客户]
         if(CollectionUtil.isNotEmpty(goodsIds)&&subjectId!=null){
             LambdaQueryWrapper<TbsBudget> lqw = new LambdaQueryWrapper<>();
             lqw.eq(TbsBudget::getBudgetState,1);
@@ -384,7 +382,6 @@ public class TbsActivityController {
                     }
                 }
             }
-
             for (TbsBudget budget : budgetList) {
                 if(budget.getConditionFlag().equals(1)){
                     List<TbsBudgetCondition> budgetConditions = tbsBudgetConditionService.getByBudgetId(budget.getId());
@@ -404,34 +401,25 @@ public class TbsActivityController {
                             centerBudgetList.add(budget);
                         }
                     }
-
                 }else {
                     centerBudgetList.add(budget);
                 }
-
             }
         }
-        List<BmsRegion> saleRegions = new ArrayList<>();
         for (TbsBudget budget : centerBudgetList) {
             if (budget.getCenterType().equals(TbsCenterType.saleRegion.name())){
-                BmsRegion region = bmsRegionService.getById(budget.getCenterId());
+                if(budget.getCenterId().equals(supplier.getRegionThird())
-                if(region!=null){
+                        ||budget.getCenterId().equals(supplier.getRegionSecond())
-                    saleRegions.add(region);
+                        ||budget.getCenterId().equals(supplier.getRegionFirst())){
+                    TbsActivityDefaultCenterVo defaultCenterVo = new TbsActivityDefaultCenterVo();
+                    BmsRegion saleRegionTemp = bmsRegionService.getById(budget.getCenterId());
+                    defaultCenterVo.setSaleRegion(saleRegionTemp);
+                    return R.ok(defaultCenterVo);
                 }
             }
         }
         TbsActivityDefaultCenterVo defaultCenterVo = new TbsActivityDefaultCenterVo();
-        if(CollectionUtil.isNotEmpty(saleRegions)){
-            BmsRegion saleRegionTemp = saleRegions.get(0);
-            for (BmsRegion saleRegion : saleRegions) {
-                if(saleRegionTemp.getLevel()<saleRegion.getLevel()){
-                    saleRegionTemp = saleRegion;
-                }
-            }
-            defaultCenterVo.setSaleRegion(saleRegionTemp);
-        }else {
         defaultCenterVo.setSupplier(supplier);
-        }
         return R.ok(defaultCenterVo);
     }
 

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

@@ -21,6 +21,7 @@ import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
 import com.qs.serve.modules.tbs.common.dto.CompensateDTO;
+import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
 import com.qs.serve.modules.tbs.entity.*;
 import com.qs.serve.modules.tbs.entity.bo.TbsActivityBo;
 import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
@@ -290,10 +291,12 @@ public class TbsCostApplyController {
     @DeleteMapping("/deleteById/{id}")
     @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE)
     @PreAuthorize("hasRole('tbs:costApply:delete')")
+    @Transactional(rollbackFor = Exception.class)
     public R<?> deleteById(@PathVariable("id") Long id){
         TbsCostApply entity = tbsCostApplyService.getById(id);
-        if(!entity.getChargeState().equals(0)&&!entity.getChargeState().equals(4)){
+        if(!entity.getChargeState().equals(0)||
-            return R.error("当前状态不支持删除");
+                !entity.getChargeState().equals(TbsCostApplyState.State_5_stop.getCode())){
+            return R.error("占用预算的申请，不支持删除");
         }
         //模板类直接删除
         if(entity.getTemplateId()!=null){

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

@@ -92,11 +92,12 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
         List<Long> seriesIds = budgetBo.getSeriesIds();
         List<Long> brandIds = budgetBo.getBrandIds();
         List<Long> categoryIds = budgetBo.getCategoryIds();
+        Long scheduleId = budgetBo.getScheduleId();
         //添加条件拦截
-        boolean sameCondition = filterSameCondition(budget,skuIds, spuIds, seriesIds, brandIds, categoryIds);
+        boolean sameCondition = filterSameCondition(scheduleId,budget,skuIds, spuIds, seriesIds, brandIds, categoryIds);
-//        if(sameCondition){
+        if(sameCondition){
-//            Assert.throwEx("已存在相同条件预算");
+            Assert.throwEx("已存在相同条件预算");
-//        }
+        }
         budget.setBudgetCode(budgetBo.getBudgetCode());
         budget.setSubjectId(budgetBo.getSubjectId());
         BmsSubject subject = null;
@@ -110,7 +111,13 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
         List<TbsScheduleItem> scheduleItems = scheduleItemService.listByScheduleId(schedule.getId());
         List<TbsScheduleItemBudget> scheduleItemBudgets = new ArrayList<>();
         for (TbsScheduleItem scheduleItem : scheduleItems) {
-            TbsScheduleItemBudget itemBudget = CopierUtil.copy(scheduleItem,new TbsScheduleItemBudget());
+            TbsScheduleItemBudget itemBudget = new TbsScheduleItemBudget();
+            itemBudget.setScheduleId(scheduleItem.getScheduleId());
+            itemBudget.setScheduleItemId(scheduleItem.getId());
+            itemBudget.setItemName(scheduleItem.getItemName());
+            itemBudget.setStartDate(scheduleItem.getStartDate());
+            itemBudget.setEndDate(scheduleItem.getEndDate());
+            itemBudget.setBudgetId(budget.getId());
             for (TbsBudgetBo.ScheduleItem boScheduleItem : budgetBo.getScheduleItems()) {
                 if(itemBudget.getId().equals(boScheduleItem.getScheduleItemId())){
                     itemBudget.setBudgetAmount(boScheduleItem.getAmount());
@@ -120,9 +127,6 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
             if(itemBudget.getBudgetAmount()==null){
                 Assert.throwEx("考核期周期需设置金额");
             }
-            itemBudget.setId(null);
-            itemBudget.setScheduleItemId(scheduleItem.getId());
-            itemBudget.setBudgetId(budget.getId());
             scheduleItemBudgets.add(itemBudget);
         }
         scheduleItemBudgetService.saveBatch(scheduleItemBudgets);
@@ -132,6 +136,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
 
     /**
      * 拦截相同条件的预算
+     * @param scheduleId
      * @param budget
      * @param skuIds
      * @param spuIds
@@ -140,7 +145,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
      * @param categoryIds
      * @return 满足无条件的返回true
      */
-    private boolean filterSameCondition(TbsBudget budget,List<Long> skuIds, List<Long> spuIds, List<Long> seriesIds, List<Long> brandIds, List<Long> categoryIds) {
+    private boolean filterSameCondition(Long scheduleId,TbsBudget budget,List<Long> skuIds, List<Long> spuIds, List<Long> seriesIds, List<Long> brandIds, List<Long> categoryIds) {
         boolean hasCondition = CollectionUtil.isNotEmpty(skuIds)||
                                 CollectionUtil.isNotEmpty(spuIds)||
                                 CollectionUtil.isNotEmpty(seriesIds)||
@@ -150,6 +155,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
         lqw.eq(TbsBudget::getSubjectId,budget.getSubjectId());
         lqw.eq(TbsBudget::getCenterType,budget.getCenterType());
         lqw.eq(TbsBudget::getCenterId,budget.getCenterId());
+        lqw.eq(TbsBudget::getScheduleId,scheduleId);
         //忽略更新情况
         if(budget.getId()!=null){
             lqw.ne(TbsBudget::getId,budget.getId());

src/main/java/com/qs/serve/modules/third/PortalController.java

@@ -16,6 +16,7 @@ import com.qs.serve.modules.third.entity.param.SSOLoginParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
- * 【第三方接口】核销系统
+ * 【第三方接口】门户接口
  * @author YenHex
  * @since 2023/2/14
  */
@@ -37,12 +38,15 @@ public class PortalController {
 
     /**
      * 单点登录
+     * @apiNote headers+ => tenant-id = 001 \n headers+ => v-token = MD5.encrypt('jslApi-'+yyyy-MM-dd)
+     * @param ssoLoginParam
+     * @param request
      * @return
      */
     @LimitSubmit
     @SysLog(title = "人员",desc = "单点登陆",biz = BizType.LOGIN)
     @PostMapping("/ssoLogin")
-    public R<?> ssoLogin(SSOLoginParam ssoLoginParam, HttpServletRequest request){
+    public R<?> ssoLogin(@RequestBody SSOLoginParam ssoLoginParam, HttpServletRequest request){
         ThirdTokenUtil.checkToken(request);
         String host = "https://crm.gdjsl.com";
         if(StringUtils.hasText(ssoLoginParam.getRewriteHost())){

src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyOperationServiceImpl.java

@@ -10,6 +10,7 @@ import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
 import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
 import com.qs.serve.modules.tbs.entity.TbsBudgetLog;
 import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
+import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo;
 import com.qs.serve.modules.tbs.service.TbsBudgetLogService;
 import com.qs.serve.modules.tzc.common.TzPolicyItemStatus;
 import com.qs.serve.modules.tzc.common.TzcPolicyStatus;
@@ -121,6 +122,15 @@ public class TzcPolicyOperationServiceImpl implements SeeYonOperationService {
         return null;
     }
 
+    @Override
+    public void pageMemberAffair4packageVo(List<CtpAffairVo> ctpAffairs) {
+        for (CtpAffairVo ctpAffairVo : ctpAffairs) {
+            TzcPolicy tzcPolicy = tzcPolicyService.getById(
+                    ctpAffairVo.getAffairInfo().getCostApplyId());
+            ctpAffairVo.setPolicyInfo(tzcPolicy);
+        }
+    }
+
     @Override
     public Object doNext(TbsAffairCommitBo param) {
         return null;