From 0a8587e6ca079de6c037e46a78909ea8f3ba269f Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 26 Jan 2024 16:17:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=BE=85=E5=8A=A9=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E5=A4=8D=EF=BC=9B=E6=9B=BF=E6=8D=A2=E5=A4=A9?= =?UTF-8?q?=E7=BF=BC=E4=BA=91=EF=BC=9B=E5=AE=A2=E6=88=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qs/serve/common/util/HttpUtil.java | 10 +- .../modules/base/TianYiYunSmsService.java | 48 +++++++++ .../bir/controller/BirRoiRateController.java | 23 ++++- .../service/impl/BirRoiRateServiceImpl.java | 4 +- .../serve/modules/bms/entity/BmsSupplier.java | 6 ++ .../impl/HisUserSupplierServiceImpl.java | 3 + .../modules/sys/entity/dto/CostDeletion.java | 23 +++++ .../service/impl/SysDeleteLogServiceImpl.java | 7 ++ .../TbsCostApplyTestController.java | 5 + .../service/PortalOfCostApplication.java | 35 ++++++- .../controller/TzcPolicyTestController.java | 97 +++++++++---------- .../impl/TzcPolicyApplicationServiceImpl.java | 79 +++++++-------- .../qs/serve/modules/wx/api/WxSvcUserApi.java | 5 +- .../mapper/bms/BmsSupplierMapper.xml | 6 ++ 14 files changed, 251 insertions(+), 100 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/base/TianYiYunSmsService.java create mode 100644 src/main/java/com/qs/serve/modules/sys/entity/dto/CostDeletion.java diff --git a/src/main/java/com/qs/serve/common/util/HttpUtil.java b/src/main/java/com/qs/serve/common/util/HttpUtil.java index 0398a3a9..33d22437 100644 --- a/src/main/java/com/qs/serve/common/util/HttpUtil.java +++ b/src/main/java/com/qs/serve/common/util/HttpUtil.java @@ -41,10 +41,12 @@ public class HttpUtil { //设post请求 HttpPost post = new HttpPost(url); //创建请求实体传参 - StringEntity postingString = new StringEntity(jsonStr,CHARSET); - postingString.setContentEncoding(EN_CONING); - //设置post请求参数 - post.setEntity(postingString); + if(jsonStr!=null){ + StringEntity postingString = new StringEntity(jsonStr,CHARSET); + postingString.setContentEncoding(EN_CONING); + //设置post请求参数 + post.setEntity(postingString); + } post.addHeader(HTTP.CONTENT_TYPE,CONTENT_TYPE); if (headers != null) { for (String key : headers.keySet()) { diff --git a/src/main/java/com/qs/serve/modules/base/TianYiYunSmsService.java b/src/main/java/com/qs/serve/modules/base/TianYiYunSmsService.java new file mode 100644 index 00000000..ac60cc61 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/base/TianYiYunSmsService.java @@ -0,0 +1,48 @@ +package com.qs.serve.modules.base; + +import cn.hutool.crypto.digest.DigestUtil; +import com.qs.serve.common.util.HttpUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; + +/** + * @author YenHex + * @since 2024/1/26 + */ +@Slf4j +@Service +public class TianYiYunSmsService { + + private final String url = "http://sms.189ek.com/yktsms/send?"; + + @Value("${tianyi.sms.appid}") + private String appId; + + @Value("${tianyi.sms.appKey}") + private String appKey; + + public void send(String phone,String code){ + //需要发送的手机号(多个号码以英文逗号 “,”分隔) 一次性最多 100 个号码 + String mobiles = phone; + String content = "【嘉士利】验证码"+code; + String sign = DigestUtil.md5Hex(appId+mobiles+content+appKey); + try { + String msg = URLEncoder.encode(content,"utf-8"); + String params = "appid="+ appId + + "&mobile="+ mobiles + + "&msg=" + msg + + "&sign=" + sign + + "&extPort="; + String result = HttpUtil.doPost(url+params,"{}",null); + log.debug("sms result = > {}",result); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + } + +} diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java index 344fd618..af92bc12 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java @@ -18,14 +18,17 @@ import com.qs.serve.modules.bir.service.*; import com.qs.serve.modules.sys.entity.SysDictData; import com.qs.serve.modules.sys.service.SysDictDataService; import com.qs.serve.modules.tbs.common.TbsCenterType; +import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem; import com.qs.serve.modules.tbs.service.TbsBudgetService; +import com.qs.serve.modules.tbs.service.TbsCostApplyService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -49,6 +52,7 @@ public class BirRoiRateController { private TbsBudgetService tbsBudgetService; private BirCenterRateService birCenterRateService; private SysDictDataService sysDictDataService; + private TbsCostApplyService costApplyService; // /** @@ -197,10 +201,21 @@ public class BirRoiRateController { */ @GetMapping("/rebuildBir") public R rebuildBir(){ - Long[] costIds = new Long[]{ - 267638L - }; - birActivityCenterGoodsService.rebuildBir(Arrays.asList(costIds).stream().distinct().collect(Collectors.toList())); + //select count(1) from tbs_cost_apply where create_time >= '2023-03-01' and create_time < '2023-04-01' + LocalDate startTime = LocalDate.of(2023,6,1); + LocalDate endTime = LocalDate.of(2023,7,1); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.select(TbsCostApply::getId); + lqw.ge(TbsCostApply::getCreateTime,startTime); + lqw.le(TbsCostApply::getCreateTime,endTime); + List costApplyList = costApplyService.list(lqw); + List costIds = costApplyList.stream().map(a->a.getId()).distinct().collect(Collectors.toList()); + birActivityCenterGoodsService.rebuildBir(costIds); + +// Long[] costIds = new Long[]{ +// 267638L +// }; +// birActivityCenterGoodsService.rebuildBir(Arrays.asList(costIds).stream().distinct().collect(Collectors.toList())); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java index 2a885973..682da77c 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java @@ -181,8 +181,8 @@ public class BirRoiRateServiceImpl extends ServiceImpl12){ - i = startMonth.getYear()*100 + 100; - continue; + i = startMonth.getYear()*100 + 101; + month = 1; } boolean isEmpty = true; for (BirRoiCostItemVo itemVo : costItemVoList) { diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java index 1e561392..1bf7bd63 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java @@ -353,6 +353,12 @@ public class BmsSupplier implements Serializable { @TableField(exist = false) private String otherUserIdsString; + /** + * 对应是supplierFlag + */ + @TableField(exist = false) + private List selectSupplierTypes; + public List listBizRegionIds(){ List list = new ArrayList<>(); list.add(this.getRegion2First()); diff --git a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java index 9a976b0d..08286954 100644 --- a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java @@ -75,6 +75,9 @@ public class HisUserSupplierServiceImpl extends ServiceImpl ss2(Long costId){ + return overRebuildCost(costId); + } + public void saveTableTmp(SysTableTemp sysTableTemp){ sysTableTempMapper.insert(sysTableTemp); } diff --git a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java index b940c8fe..34820180 100644 --- a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java +++ b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java @@ -227,11 +227,44 @@ public class PortalOfCostApplication { } + /** + * 重新构建 + */ + public void rebuildCreateCostProcessByPolicy(){ + Long[] errorCostIds = new Long[]{279525L,280099L,280383L,280384L,280385L,280386L,280387L,280390L,280393L,280395L,280396L, + 280397L,280403L,280408L,280410L,280413L,280422L,280424L,280425L,280428L,280433L,280442L,280447L,280454L, + 280456L,280458L,280460L,280466L,280488L,280494L,280503L,280504L,280508L,280510L,280513L,280530L,280536L, + 280543L,280546L,280553L,280555L,280556L,280557L,280558L,280562L,280563L,280565L,280566L,280567L,280569L, + 280570L,280573L,280579L,280583L,280587L,280600L,280610L,280623L,280624L,280626L,280650L,280652L,280653L, + 280655L,280657L,280663L,280664L,280672L,280678L,280679L,280687L,280691L,280694L,280697L,280698L,280699L, + 280700L,280701L,280720L,280721L,280723L,280736L,280741L,280743L,280745L,280748L,280749L,280750L,280757L, + 280760L,280775L,280798L,280799L,280800L,280803L,280806L,280825L,280835L,280844L,280845L,280849L,280850L, + 280851L,280852L,280856L,280859L,280869L,280871L,280872L,280873L,280874L}; + + // costApplyService.save(costApply); + // activityService.save(activity); + // activitySubjectService.save(activitySubject); + // activityCenterService.save(activityCenter); + // activityGoodsService.saveBatch(activityGoodsList); + // activityCenterGoodsService.saveBatch(activityCenterGoodsList); + + // budgetLogService.save(dropPolicyBudgetLog); + // budgetLogService.saveBatch(budgetLogList); + // costItemService.saveBatch(costItemList); + + // policyItemLogService.save(policyItemLog); + // policyItemServiceService.updateById(policyItemParam); + + // verificationService.save(verification); + // verificationSubjectService.save(verificationSubject); + + + } + /** * 已弃用，适用 syncXltPolicyItemPayment代替 * @param createBo */ -// @Deprecated @Transactional(rollbackFor = Exception.class) public void createCostProcessByPolicy(ProcessCreatePolicyCostBo createBo){ SysUser user = userService.getByAccount(createBo.getUserCode()); diff --git a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java index 65829d7e..2c0e9cb1 100644 --- a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java +++ b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java @@ -9,9 +9,7 @@ import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.BudgetLogOptFlag; import com.qs.serve.common.model.enums.SystemModule; -import com.qs.serve.common.util.AuthContextUtils; -import com.qs.serve.common.util.PageUtil; -import com.qs.serve.common.util.StringUtils; +import com.qs.serve.common.util.*; import com.qs.serve.modules.bms.entity.BmsRegion2; import com.qs.serve.modules.bms.service.BmsRegion2Service; import com.qs.serve.modules.seeyon.entity.CtpAffairQo; @@ -23,6 +21,7 @@ import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil; import com.qs.serve.modules.tbs.entity.TbsBudget; +import com.qs.serve.modules.tbs.entity.TbsBudgetCostItem; import com.qs.serve.modules.tbs.entity.TbsBudgetCostItemPolicy; import com.qs.serve.modules.tbs.entity.TbsBudgetLog; import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo; @@ -80,7 +79,7 @@ public class TzcPolicyTestController { @GetMapping("/testSyncPolicy") public R syncPolicy(Long policyId){ - tzcPolicyApplicationService.syncPolicyItem(policyId); + //tzcPolicyApplicationService.syncPolicyItem(policyId); return R.ok(); } @@ -88,7 +87,10 @@ public class TzcPolicyTestController { @GetMapping("/rebulidAllPolicy") public R rebulidAllPolicy(){ Long[] ids = new Long[]{ - + //487L, + //555L, + //738L, + 775L }; for (Long id : ids) { rebuildPolicy(id); @@ -98,9 +100,8 @@ public class TzcPolicyTestController { public R rebuildPolicy(Long policyId){ - // TzcPolicy tzcPolicy = tzcPolicyService.getById(policyId); - //Integer tzcPolicyStatus = tzcPolicy.getPolicyStatus(); - //SysUser sysUser = sysUserService.getById(tzcPolicy.getCreateBy()); + TzcPolicy tzcPolicy = tzcPolicyService.getById(policyId); + SysUser sysUser = sysUserService.getById(tzcPolicy.getCreateBy()); SysTableTemp sysTableTemp = new SysTableTemp(); sysTableTemp.setTableName("policyId"); @@ -109,7 +110,7 @@ public class TzcPolicyTestController { TbsBudgetCostResult result = policyApplicationService.buildBudgetCostResult(policyId,false,false); if(result.getBudgetUnMatchList()!=null&&result.getBudgetUnMatchList().size()>0){ sysTableTemp.setResultMsg("政策匹配预算失败"); - sysTableTempMapper.insert(sysTableTemp); + //sysTableTempMapper.insert(sysTableTemp); return R.error("政策匹配预算失败"); } LambdaQueryWrapper itemPolicyLqw = new LambdaQueryWrapper<>(); @@ -132,54 +133,49 @@ public class TzcPolicyTestController { } } + //判断是否正常数据 if(isMatchAll){ sysTableTemp.setResultMsg("正常"); - sysTableTempMapper.insert(sysTableTemp); + //sysTableTempMapper.insert(sysTableTemp); return R.ok("正常"); }else { - sysTableTemp.setResultMsg("预算占用错误"); - sysTableTempMapper.insert(sysTableTemp); - return R.ok("预算占用错误"); + //sysTableTemp.setResultMsg("预算占用错误"); + //sysTableTempMapper.insert(sysTableTemp); + //return R.ok("预算占用错误"); } -// tbsBudgetCostItemPolicyService.saveBatch(allBudgetItem); -// //保存预算使用日志 -// List budgetLogList = saveBudgetLog(result, sysUser, tzcPolicy, result.getPolicyBudgetMatchList(),result.getPolicyItemList()); -// if(tzcPolicyStatus.equals(TzcPolicyStatus.Status_0_UnCommit)){ -// budgetLogService.saveBatch(budgetLogList); -// }else { -// //排除历史记录 -// LambdaQueryWrapper logLqw = new LambdaQueryWrapper<>(); -// logLqw.eq(TbsBudgetLog::getPolicyId,policyId); -// logLqw.eq(TbsBudgetLog::getRollbackFlag, BudgetLogRollbackFlag.State_1); -// List oldLogList = budgetLogService.list(logLqw); -// List oldLogList4Upd = oldLogList.stream().map(a->{ -// TbsBudgetLog budgetLog = new TbsBudgetLog(); -// budgetLog.setId(a.getId()); -// budgetLog.setRollbackFlag(BudgetLogRollbackFlag.State_2); -// return budgetLog; -// }).collect(Collectors.toList()); -// budgetLogService.updateBatchById(oldLogList4Upd); -// for (TbsBudgetLog budgetLog : oldLogList) { -// budgetLog.setCreateBy(null); -// budgetLog.setCreateTime(null); -// budgetLog.setUpdateBy(null); -// budgetLog.setUpdateTime(null); -// budgetLog.setId(null); -// BudgetLogOptFlag optFlag = BudgetLogOptFlag.State_12; -// budgetLog.setAmount(TbsBudgetLogBuildUtil.buildAmount(budgetLog.getAmount(),optFlag)); -// budgetLog.setOptType(optFlag.getCode()); -// } -// budgetLogService.saveBatch(oldLogList); -// BudgetLogOptFlag optFlag = BudgetLogOptFlag.State_13; -// budgetLogList.forEach(a->{ -// a.setOptType(optFlag.getCode()); -// a.setAmount(TbsBudgetLogBuildUtil.buildAmount(a.getAmount(),optFlag)); -// }); -// budgetLogService.saveBatch(budgetLogList); -// } - //return R.ok(); + //保存预算使用日志 + List budgetLogList = saveBudgetLog(result, sysUser, tzcPolicy, result.getPolicyBudgetMatchList(),result.getPolicyItemList()); + LambdaQueryWrapper citemLqw = new LambdaQueryWrapper<>(); + citemLqw.eq(TbsBudgetCostItemPolicy::getPolicyId,policyId); + List itemList = tbsBudgetCostItemPolicyService.list(citemLqw); + //Assert.throwEx("dev"); + // 设置remark标记防止误删,移除旧的记录 + for (TbsBudgetCostItemPolicy costItem : itemList) { + costItem.setRemark("toDel"); + } + tbsBudgetCostItemPolicyService.updateBatchById(itemList); + List itemIds = itemList.stream().map(TbsBudgetCostItemPolicy::getId).collect(Collectors.toList()); + tbsBudgetCostItemPolicyService.removeBatchByIds(itemIds); + tbsBudgetCostItemPolicyService.saveBatch(allBudgetItem); + + + // 设置remark标记防止误删,移除旧的记录 + LambdaQueryWrapper bLqw = new LambdaQueryWrapper<>(); + bLqw.eq(TbsBudgetLog::getPolicyId,policyId); + List dbbudgetLogs = budgetLogService.list(bLqw); + for (TbsBudgetLog budgetLog : dbbudgetLogs) { + budgetLog.setRemark("toDel"); + } + budgetLogService.updateBatchById(dbbudgetLogs); + List budIds = dbbudgetLogs.stream().map(TbsBudgetLog::getId).collect(Collectors.toList()); + budgetLogService.removeBatchByIds(budIds); + //重新保存 + if(CollectionUtil.isNotEmpty(budgetLogList)){ + budgetLogService.saveBatch(budgetLogList); + } + return R.ok(); } /** @@ -218,5 +214,6 @@ public class TzcPolicyTestController { } return budgetLogList; } + } diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java index 3d9ff180..5597ebfb 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.tzc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.common.config.properties.ProjectApisProperties; import com.qs.serve.common.config.properties.ProjectProperties; import com.qs.serve.common.framework.manager.AsyncFactory; @@ -182,24 +183,24 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ policyItemDto.setInvCodeList(invCodes); policyItemDto.setPolicyGoodsItemList(goodsItems); - -// String policySyncInvUrl = projectApisProperties.getPolicySyncInv(); + //测试环境不进入生成 + if(!DevEnvironmentConfig.isDev()){ + String policySyncInvUrl = projectApisProperties.getPolicySyncInv(); // String policySyncCateUrl = projectApisProperties.getPolicySyncCate(); -// String dataJson = JsonUtil.objectToJson(policyItemDto); + String dataJson = JsonUtil.objectToJson(policyItemDto); // -// String rs = HttpUtil.doPost(policySyncInvUrl, dataJson, null); -// log.debug("policySyncInvUrl:{}\n result:{}",policySyncInvUrl,rs); + String rs = HttpUtil.doPost(policySyncInvUrl, dataJson, null); + log.debug("policySyncInvUrl:{}\n result:{}",policySyncInvUrl,rs); // String rs2 = HttpUtil.doPost(policySyncCateUrl, dataJson, null); // log.debug("policySyncCateUrl:{}\n result:{}",policySyncCateUrl,rs2); - //TODO 测试临时注释 - //保存异步处理的 - xiaoLuTonService.savePolicyItem(policyItemDto); - TzcPolicyItem updParam = new TzcPolicyItem(); - updParam.setId(policyItemId); - updParam.setPolicyItemStatus(TzPolicyItemStatus.Status_2_SyncSuccess); - tzcPolicyItemService.updateById(updParam); - + //保存异步处理的 + //xiaoLuTonService.savePolicyItem(policyItemDto); + TzcPolicyItem updParam = new TzcPolicyItem(); + updParam.setId(policyItemId); + updParam.setPolicyItemStatus(TzPolicyItemStatus.Status_2_SyncSuccess); + tzcPolicyItemService.updateById(updParam); + } } @@ -302,32 +303,34 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ //排除历史记录 LambdaQueryWrapper logLqw = new LambdaQueryWrapper<>(); logLqw.eq(TbsBudgetLog::getPolicyId,policyId); - logLqw.eq(TbsBudgetLog::getRollbackFlag, BudgetLogRollbackFlag.State_1); - List oldLogList = budgetLogService.list(logLqw); - List oldLogList4Upd = oldLogList.stream().map(a->{ - TbsBudgetLog budgetLog = new TbsBudgetLog(); - budgetLog.setId(a.getId()); - budgetLog.setRollbackFlag(BudgetLogRollbackFlag.State_2); - return budgetLog; - }).collect(Collectors.toList()); - budgetLogService.updateBatchById(oldLogList4Upd); - for (TbsBudgetLog budgetLog : oldLogList) { - budgetLog.setCreateBy(null); - budgetLog.setCreateTime(null); - budgetLog.setUpdateBy(null); - budgetLog.setUpdateTime(null); - budgetLog.setId(null); - BudgetLogOptFlag optFlag = BudgetLogOptFlag.State_12; - budgetLog.setAmount(TbsBudgetLogBuildUtil.buildAmount(budgetLog.getAmount(),optFlag)); - budgetLog.setOptType(optFlag.getCode()); - } - budgetLogService.saveBatch(oldLogList); - BudgetLogOptFlag optFlag = BudgetLogOptFlag.State_13; - budgetLogList.forEach(a->{ - a.setOptType(optFlag.getCode()); - a.setAmount(TbsBudgetLogBuildUtil.buildAmount(a.getAmount(),optFlag)); - }); +// logLqw.eq(TbsBudgetLog::getRollbackFlag, BudgetLogRollbackFlag.State_1); + budgetLogService.remove(logLqw); budgetLogService.saveBatch(budgetLogList); +// List oldLogList = budgetLogService.list(logLqw); +// List oldLogList4Upd = oldLogList.stream().map(a->{ +// TbsBudgetLog budgetLog = new TbsBudgetLog(); +// budgetLog.setId(a.getId()); +// budgetLog.setRollbackFlag(BudgetLogRollbackFlag.State_2); +// return budgetLog; +// }).collect(Collectors.toList()); +// budgetLogService.updateBatchById(oldLogList4Upd); +// for (TbsBudgetLog budgetLog : oldLogList) { +// budgetLog.setCreateBy(null); +// budgetLog.setCreateTime(null); +// budgetLog.setUpdateBy(null); +// budgetLog.setUpdateTime(null); +// budgetLog.setId(null); +// BudgetLogOptFlag optFlag = BudgetLogOptFlag.State_12; +// budgetLog.setAmount(TbsBudgetLogBuildUtil.buildAmount(budgetLog.getAmount(),optFlag)); +// budgetLog.setOptType(optFlag.getCode()); +// } +// budgetLogService.saveBatch(oldLogList); +// BudgetLogOptFlag optFlag = BudgetLogOptFlag.State_13; +// budgetLogList.forEach(a->{ +// a.setOptType(optFlag.getCode()); +// a.setAmount(TbsBudgetLogBuildUtil.buildAmount(a.getAmount(),optFlag)); +// }); +// budgetLogService.saveBatch(budgetLogList); } //创建流程后回调 BaseCreateCallbackBo callbackBo = new BaseCreateCallbackBo(TbsSeeYonConst.PolicyConf.Code(),tzcPolicy.getId()+""); diff --git a/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java b/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java index 42032aea..2e395ea5 100644 --- a/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java +++ b/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java @@ -16,6 +16,7 @@ import com.qs.serve.common.util.IdUtil; import com.qs.serve.common.util.JwtUtils; import com.qs.serve.common.util.StringUtils; import com.qs.serve.modules.base.TencentYunSmsService; +import com.qs.serve.modules.base.TianYiYunSmsService; import com.qs.serve.modules.sys.entity.SysDept; import com.qs.serve.modules.sys.entity.SysRole; import com.qs.serve.modules.sys.entity.SysUser; @@ -54,6 +55,7 @@ public class WxSvcUserApi { private RedisService redisService; private SysUserService sysUserService; private TencentYunSmsService tencentYunSmsService; + private TianYiYunSmsService tianYiYunSmsService; private SysUserDetailsServiceImpl userDetailsService; private SysRoleService sysRoleService; private SysUserSalesService sysUserSalesService; @@ -104,7 +106,8 @@ public class WxSvcUserApi { if(code==null){ code = IdUtil.genCode(6); } - tencentYunSmsService.send(phone,code); + tianYiYunSmsService.send(phone,code); + //tencentYunSmsService.send(phone,code); log.debug("手机'{}'验证码：{}",phone,code); redisService.set(key,code,10, TimeUnit.MINUTES); return R.ok(); diff --git a/src/main/resources/mapper/bms/BmsSupplierMapper.xml b/src/main/resources/mapper/bms/BmsSupplierMapper.xml index a916c125..e5af0da9 100644 --- a/src/main/resources/mapper/bms/BmsSupplierMapper.xml +++ b/src/main/resources/mapper/bms/BmsSupplierMapper.xml @@ -116,6 +116,12 @@ and (`bms_supplier`.`user_code` LIKE CONCAT('%',#{query.searchUserCode},'%') or `bms_supplier`.`other_user_codes` LIKE CONCAT('%',#{query.searchUserCode},'%') ) + + and bms_supplier.supplier_flag in + + #{selectId} + + and bms_supplier.id in