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

src/main/java/com/qs/serve/common/config/properties/SeeYonProperties.java

@@ -23,4 +23,6 @@ public class SeeYonProperties {
 
     private String url;
 
+    private String extApi;
+
 }

src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java

@@ -101,7 +101,8 @@ public class BirCenterRateServiceImpl implements BirCenterRateService {
     }
 
 
-    public TbsCostSubItem.CostCenterTranStr buildCostCenter(String centerType,String centerId,String centerName){
+    @Override
+    public TbsCostSubItem.CostCenterTranStr buildCostCenter(String centerType, String centerId, String centerName){
 
         int year = LocalDate.now().getYear();
         int month = LocalDate.now().getMonthValue();

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

@@ -54,12 +54,12 @@ public class OmsShoppingCartApi {
     @GetMapping("/page")
     public R<PageVo<OmsShoppingCart>> getPage(OmsShoppingCart param){
         BmsSupplier supplier = AuthContextUtils.getCurrentSupplier();
-        WxUser wxUser = wxUserService.getCurrentWxUser(true);
+        String sysUserId = AuthContextUtils.getSysUserId();
-        if(wxUser==null){
+        if(sysUserId==null){
             return R.byEmptyList();
         }
         LambdaQueryWrapper<OmsShoppingCart> shoppingCartWrapper = new LambdaQueryWrapper<>(param);
-        shoppingCartWrapper.eq(OmsShoppingCart::getUserId,wxUser.getSysUserId());
+        shoppingCartWrapper.eq(OmsShoppingCart::getUserId,sysUserId);
         PageUtil.startPage();
         List<OmsShoppingCart> shoppingCarts = omsShoppingCartService.list(shoppingCartWrapper);
         omsShoppingCartService.checkShoppingCarts(supplier,shoppingCarts,false);
@@ -91,8 +91,7 @@ public class OmsShoppingCartApi {
     public R<?> save(@RequestBody @Valid OmsShoppingCartSaveBo param){
         BmsSupplier supplier = AuthContextUtils.getCurrentSupplier();
         OmsShoppingCart shoppingCart = CopierUtil.copy(param,new OmsShoppingCart());
-        WxUser wxUser = wxUserService.getCurrentWxUser(true);
+        shoppingCart.setUserId(AuthContextUtils.getSysUserId());
-        shoppingCart.setUserId(wxUser.getSysUserId());
         GoodsSku goodsSku = goodsSkuService.getById(shoppingCart.getSkuId());
         if(!goodsSku.getEnable().equals(1)){
             return R.error("商品项["+goodsSku.getSpecInfos()+"]停用中");

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

@@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.google.gson.JsonArray;
+import com.qs.serve.common.config.properties.SeeYonProperties;
 import com.qs.serve.common.framework.security.model.LoginUser;
 import com.qs.serve.common.model.annotation.LimitSubmit;
 import com.qs.serve.common.model.annotation.SysLog;
@@ -188,6 +189,7 @@ public class SysUserController {
         sysUser.setPassword(SecureUtil.md5(param.getNewPassword()));
         sysUser.setUpdateTime(LocalDateTime.now());
         sysUserService.updateById(sysUser);
+        sysUserService.updateSeeYonPassword(sysUser.getSyUserId(),param.getNewPassword());
         return R.ok();
     }
 
@@ -207,6 +209,7 @@ public class SysUserController {
             sysUser.setPassword(SecureUtil.md5(param.getNewPassword()));
             sysUser.setUpdateTime(LocalDateTime.now());
             sysUserService.updateById(sysUser);
+            sysUserService.updateSeeYonPassword(sysUser.getSyUserId(),param.getNewPassword());
             return R.ok();
         }
         return R.error();

src/main/java/com/qs/serve/modules/sys/entity/dto/SysUpdateSeeYonPassword.java

@@ -0,0 +1,18 @@
+package com.qs.serve.modules.sys.entity.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2023/8/31
+ */
+@Data
+@AllArgsConstructor
+public class SysUpdateSeeYonPassword {
+
+    String memberId;
+
+    String password;
+
+}

src/main/java/com/qs/serve/modules/sys/service/SysUserService.java

@@ -16,6 +16,7 @@ import java.util.List;
  */
 public interface SysUserService extends IService<SysUser> {
 
+    void updateSeeYonPassword(String syUserId,String password);
 
     /**
      * 账号查询

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.DesensitizedUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.config.properties.SeeYonProperties;
 import com.qs.serve.common.framework.security.model.LoginUser;
 import com.qs.serve.common.framework.security.model.LoginUserType;
 import com.qs.serve.common.model.enums.HttpCode;
@@ -11,6 +12,7 @@ import com.qs.serve.common.util.*;
 import com.qs.serve.modules.bms.entity.BmsRegionUser;
 import com.qs.serve.modules.sys.entity.*;
 import com.qs.serve.modules.sys.entity.bo.SysUserLeaveBo;
+import com.qs.serve.modules.sys.entity.dto.SysUpdateSeeYonPassword;
 import com.qs.serve.modules.sys.mapper.*;
 import com.qs.serve.modules.sys.service.*;
 import lombok.AllArgsConstructor;
@@ -44,7 +46,20 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private final SysMenuMapper sysMenuMapper;
     private final SysPostMapper postMapper;
     private final SysPostUserMapper postUserMapper;
+    private SeeYonProperties seeYonProperties;
 
+    @Override
+    public void updateSeeYonPassword(String syUserId, String password) {
+        String apihost = seeYonProperties.getExtApi();
+        if(StringUtils.hasText(syUserId)&&StringUtils.hasText(apihost)){
+            String updateJson = JsonUtil.objectToJson(new SysUpdateSeeYonPassword(syUserId,password));
+            try {
+                HttpUtil.doPost(apihost+"/api/oa/base/user/changePassword",updateJson,null);
+            } catch (Exception e) {
+                log.error(e.getMessage());
+            }
+        }
+    }
 
     @Override
     public SysUser getByAccount(String acc) {

src/main/java/com/qs/serve/modules/tbs/common/dto/TbsBudgetChangeVo.java

@@ -124,4 +124,6 @@ public class TbsBudgetChangeVo {
 
     /** 是否批量提交 */
     private Integer batchApplyFlag;
+
+    private Long batchApplyId;
 }

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

@@ -124,6 +124,8 @@ public class TbsBudget implements Serializable {
     /** 是否批量提交 */
     private Integer batchApplyFlag;
 
+    private Long batchApplyId;
+
     /** 创建时间 */
     @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/TbsBudgetChange.java

@@ -115,6 +115,8 @@ public class TbsBudgetChange implements Serializable {
     /** 是否批量提交 */
     private Integer batchApplyFlag;
 
+    private Long batchApplyId;
+
     /** 申请人 */
     @NotBlank(message = "申请人不能为空")
     @Length(max = 32,message = "申请人长度不能超过32字")

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

@@ -194,6 +194,9 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
             return null;
         }
 
+        this.save(budgetBatch);
+        //保存后赋值
+        Long batchId = budgetBatch.getId();
         //修改的生成为更变记录
         List<TbsBudgetBatchBo.BudgetMain> updBudgetList = paramBudgetList.stream()
                 .filter(a->StringUtils.hasText(a.getBudgetNumber())).collect(Collectors.toList());
@@ -227,6 +230,7 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
                     budgetChange.setUserCode(sysUser.getCode());
                     budgetChange.setUserName(sysUser.getName());
                     budgetChange.setBatchApplyFlag(1);
+                    budgetChange.setBatchApplyId(batchId);
                     budgetChange.setBudgetCheckState(TbsBudgetCheckState.State_1_apply);
                     boolean notChangeTitle = paramItem.getBudgetName()!=null&& paramItem.getBudgetName().equals(budget.getBudgetCode());
                     if(!notChangeTitle){
@@ -252,7 +256,7 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
 
                 }else {
                     //修改后为新增类型提交
-                    this.toUpdateBudgetInfo(sysUser, scheduleMap, subjectMap, centerDtoMap, categoryMap, paramItem, budgetId);
+                    this.toUpdateBudgetInfo(batchId,sysUser, scheduleMap, subjectMap, centerDtoMap, categoryMap, paramItem, budgetId);
                     TbsBudgetBatchItem batchItem = new TbsBudgetBatchItem();
                     batchItem.setBudgetId(budgetId);
                     batchItem.setBatchState(TbsBudgetCheckState.State_1_apply);
@@ -268,7 +272,9 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
                 .filter(a->!StringUtils.hasText(a.getBudgetNumber())).collect(Collectors.toList());
         for (TbsBudgetBatchBo.BudgetMain budgetMain : addBudgetList) {
             TbsBudget newBudget = new TbsBudget();
+            newBudget.setBudgetNumber("BM"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Budget));
             newBudget.setBatchApplyFlag(1);
+            newBudget.setBatchApplyId(batchId);
             TbsSchedule schedule = scheduleMap.get(budgetMain.getScheduleName());
             this.initBudget4Update(sysUser,schedule, subjectMap, centerDtoMap, budgetMain, newBudget);
             tbsBudgetService.save(newBudget);
@@ -291,15 +297,12 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
             batchItem.setUserName(sysUser.getName());
             batchItems.add(batchItem);
         }
-        this.save(budgetBatch);
-        //保存后赋值
-        Long batchId = budgetBatch.getId();
         batchItems.forEach(batchItem->batchItem.setBatchId(batchId));
         tbsBudgetBatchItemService.saveBatch(batchItems);
         return budgetBatch;
     }
 
-    private void toUpdateBudgetInfo(SysUser sysUser, Map<String, TbsSchedule> scheduleMap, Map<String, BmsSubject> subjectMap, Map<String, TbsCenterDto> centerDtoMap, Map<String, GoodsCategory> categoryMap, TbsBudgetBatchBo.BudgetMain paramItem, Long budgetId) {
+    private void toUpdateBudgetInfo(Long batchId,SysUser sysUser, Map<String, TbsSchedule> scheduleMap, Map<String, BmsSubject> subjectMap, Map<String, TbsCenterDto> centerDtoMap, Map<String, GoodsCategory> categoryMap, TbsBudgetBatchBo.BudgetMain paramItem, Long budgetId) {
         tbsBudgetService.removeById(budgetId);
         tbsBudgetConditionService.remove(
                 new LambdaQueryWrapper<TbsBudgetCondition>()
@@ -313,6 +316,7 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
         TbsBudget newBudget = new TbsBudget();
         newBudget.setId(budgetId);
         newBudget.setBatchApplyFlag(1);
+        newBudget.setBatchApplyId(batchId);
         newBudget.setUserId(sysUser.getId());
         newBudget.setUserCode(sysUser.getCode());
         newBudget.setUserName(sysUser.getName());

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

@@ -121,15 +121,15 @@ public class TbsBudgetChangeServiceImpl extends ServiceImpl<TbsBudgetChangeMappe
         query.setPageSize(PageUtil.getPageSize());
         query.setStartRow(PageUtil.getStartRow());
         List<TbsBudgetChangeVo> result = baseMapper.selectChangeVoList(query);
-        for (TbsBudgetChangeVo changeVo : result) {
+//        for (TbsBudgetChangeVo changeVo : result) {
-            if(changeVo.getBatchApplyFlag().equals(1)){
+//            if(changeVo.getBatchApplyFlag().equals(1)){
-                if(changeVo.getType().equals(ChangeTypeEnum.change.name())){
+//                if(changeVo.getType().equals(ChangeTypeEnum.change.name())){
-                    changeVo.setType(ChangeTypeEnum.batchChange.name());
+//                    changeVo.setType(ChangeTypeEnum.batchChange.name());
-                }else {
+//                }else {
-                    changeVo.setType(ChangeTypeEnum.batchApply.name());
+//                    changeVo.setType(ChangeTypeEnum.batchApply.name());
-                }
+//                }
-            }
+//            }
-        }
+//        }
         return result;
     }
 

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

@@ -138,6 +138,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
         tbsBudget.setUserCode(sysUser.getCode());
         tbsBudget.setUserName(sysUser.getName());
         tbsBudget.setBatchApplyFlag(0);
+        tbsBudget.setBatchApplyId(0L);
         this.updateById(tbsBudget);
 
         //创建流程后回调

src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java

@@ -102,6 +102,15 @@ public class VtbVerification implements Serializable {
     @TableField(condition = SqlCondition.LIKE)
     private String supplierName;
 
+    @TableField(condition = SqlCondition.LIKE)
+    private String supplierBizRegionFirstName;
+
+    @TableField(condition = SqlCondition.LIKE)
+    private String supplierBizRegionSecondName;
+
+    @TableField(condition = SqlCondition.LIKE)
+    private String supplierBizRegionThirdName;
+
     /** 支付方式id */
     private Long wayId;
 

src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationSo.java

@@ -31,6 +31,8 @@ public class VtbVerificationSo implements Serializable {
     /** 活动id */
     private Long activityId;
 
+    private String activityCode;
+
     /** 核销编码 */
     private String verificationCode;
 
@@ -60,5 +62,14 @@ public class VtbVerificationSo implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime queryEndTime;
 
+    @TableField(condition = SqlCondition.LIKE)
+    private String supplierBizRegionFirstName;
+
+    @TableField(condition = SqlCondition.LIKE)
+    private String supplierBizRegionSecondName;
+
+    @TableField(condition = SqlCondition.LIKE)
+    private String supplierBizRegionThirdName;
+
 }
 

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

@@ -10,6 +10,7 @@ import com.qs.serve.common.model.enums.BudgetLogOptFlag;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.*;
 import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.modules.bir.service.BirCenterRateService;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper;
 import com.qs.serve.modules.bms.mapper.BmsRegionMapper;
@@ -31,6 +32,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.*;
 import com.qs.serve.modules.tbs.entity.bo.TbsActivityReopenBo;
+import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem;
 import com.qs.serve.modules.tbs.mapper.TbsCostPercentMapper;
 import com.qs.serve.modules.tbs.service.*;
 import com.qs.serve.modules.vtb.common.VtbFundFlowType;
@@ -81,6 +83,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
     private final BmsChannelService channelService;
     private final BmsChannelPointService channelPointService;
     private final BmsSupplierService bmsSupplierService;
+    private final BirCenterRateService centerRateService;
 
     private final VtbVerificationChannelService verificationChannelService;
     private final VtbVerificationChannelPointService verificationChannelPointService;
@@ -629,6 +632,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         verification.setRemark(verificationBo.getRemark());
         verification.setWayId(payWay.getId());
         verification.setWayTitle(payWay.getTitle());
+        verification.setSupplierBizRegionFirstName(costApply.getSupplierBizRegionFirstName());
+        verification.setSupplierBizRegionSecondName(costApply.getSupplierBizRegionSecondName());
+        verification.setSupplierBizRegionThirdName(costApply.getSupplierBizRegionThirdName());
         List<VtbVerificationChannelBo> channelBoList = verificationBo.getChannelList();
         List<VtbVerificationChannelPointBo> pointBoList = verificationBo.getPointList();
         List<VtbVerificationChannel> vtbVerificationChannelList = new ArrayList<>();
@@ -768,6 +774,18 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         data.put("exsp5",urlKey);
         data.put("cmsLink",baseJumpUrl);
 
+        List<Object> subList = new ArrayList<>();
+        try {
+            List<TbsActivityCenter> activityCenter = activityCenterService.listByActivity(verification.getActivityId());
+            for(TbsActivityCenter center : activityCenter){
+                TbsCostSubItem.CostCenterTranStr costCenter = centerRateService.buildCostCenter(center.getCenterType(),center.getCenterId(),center.getCenterName());
+                subList.add(costCenter);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        data.put("sub",subList);
+
         BaseCreateProcessBo createProcess = new BaseCreateProcessBo();
         createProcess.setTemplateCode(TbsSeeYonConst.CostCheckConf.Code());
         createProcess.setMemberLoginName(sysUser.getSyAccount());

src/main/resources/application-dev.yml

@@ -8,6 +8,8 @@ project:
   seeyon:
     enable: true
     url: 'http://192.168.0.9:7444'
+    #请求致远OA的拓展服务（用于修改密码）
+    extApi: 'http://192.168.10.244:9003/'
 
   upload:
     #上传映射地址

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

@@ -54,7 +54,8 @@
             tbs_budget.`user_code`,
             tbs_budget.`user_name`,
             tbs_budget.`remark`,
-            tbs_budget.`batch_apply_flag`
+            tbs_budget.`batch_apply_flag`,
+            tbs_budget.`batch_apply_id`
         from tbs_budget
         where tbs_budget.del_flag = 0 and `tbs_budget`.`budget_check_state` != 0
         <if test="query.budgetId != null"> and `tbs_budget`.`id` = #{query.budgetId}</if>
@@ -94,7 +95,8 @@
             tbs_budget_change.`user_id`,
             tbs_budget_change.`user_code`,
             tbs_budget_change.`user_name`,
-            tbs_budget_change.`batch_apply_flag`
+            tbs_budget_change.`batch_apply_flag`,
+            tbs_budget_change.`batch_apply_id`
         from tbs_budget_change
         where tbs_budget_change.del_flag = 0
         <if test="query.code != null and query.code != ''">