From ff2531da1476f6fcc3993097c9e852ec4b7ab1c7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 10 Jul 2021 13:40:13 +0800
Subject: [PATCH] 新增美度正式环境配置
---
zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java | 2 ++
zq-erp/src/test/java/com/matrix/TcProjTest.java | 40 +++++++++++++++++++++++++++++++++++++---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 13 +++++++++++++
zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java | 3 +++
zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java | 1 +
5 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java
index 86b537b..e0044cc 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java
@@ -135,7 +135,9 @@
}
//删除用户权限缓存
String redisKey=DefaultAuthorityManager.USER_POWER_REDISKEY+ SecureUtil.md5(oldSysUsers.getSuId()+"");
+ String redisKeyPc=DefaultAuthorityManager.USER_POWER_REDISKEY_PC+ SecureUtil.md5(oldSysUsers.getSuId()+"");
redisClient.removeObject(redisKey);
+ redisClient.removeObject(redisKeyPc);
return MatrixConstance.DML_SUCCESSS;
}
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
index bcde36d..c9b2bec 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
@@ -12,6 +12,7 @@
import com.matrix.system.hive.vo.AchieveNewStatisticsVo;
import org.apache.ibatis.annotations.Param;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -88,4 +89,6 @@
int updateAchieveNumOfPeople(@Param("list") List<AchieveNew> list, @Param("num") Double num);
IPage<AchieveNewStatisticsVo> achieveNewStatistics(Page<AchieveNewStatisticsVo> page, @Param("record")AchieveNewStatisticsDto queryDto);
+
+ void setPayMethod(@Param("paymethod") String paymethod, @Param("list") ArrayList<Long> ids);
}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java
index 7c816e3..f05780d 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java
@@ -23,4 +23,5 @@
Integer updateTimeByOrderId(@Param("orderId") Long orderId, @Param("payTime") Date payTime);
Integer deleteByOrderId(@Param("orderId") Long orderId);
+
}
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index 2721f19..1181f74 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -1198,4 +1198,17 @@
update achieve_new set number_of_people=#{num} where id=#{item.id}
</foreach>
</update>
+ <update id="setPayMethod">
+
+
+ update achieve_new
+ set pay_method=#{paymethod}
+ where id in
+ <foreach collection="list" index="index" item="item" open="("
+ separator="," close=")">
+ #{item}
+ </foreach>
+
+
+ </update>
</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/test/java/com/matrix/TcProjTest.java b/zq-erp/src/test/java/com/matrix/TcProjTest.java
index 4b5e0ba..c1e7cf5 100644
--- a/zq-erp/src/test/java/com/matrix/TcProjTest.java
+++ b/zq-erp/src/test/java/com/matrix/TcProjTest.java
@@ -1,12 +1,20 @@
package com.matrix;
+import com.matrix.core.tools.StringUtils;
+import com.matrix.system.hive.bean.AchieveNew;
+import com.matrix.system.hive.bean.SysOrderFlow;
import com.matrix.system.hive.dao.AchieveNewDao;
+import com.matrix.system.hive.dao.SysOrderFlowDao;
import com.matrix.system.hive.dao.SysProjUseDao;
+import com.matrix.system.hive.plugin.util.CollectionUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* @author wzy
@@ -23,11 +31,37 @@
@Autowired
AchieveNewDao achieveNewDao;
+ @Autowired
+ SysOrderFlowDao orderFlowDao;
+
@Test
public void tcProjTest() {
- //achieveNewDao
+ List<AchieveNew> achieveNewList=achieveNewDao.selectInPage(null,null);
+ ArrayList<Long> ids=new ArrayList<>();
+ ArrayList<Long> xjs=new ArrayList<>();
+ ArrayList<Long> hks=new ArrayList<>();
-
-
+ for (int i = 0; i < achieveNewList.size(); i++) {
+ AchieveNew item=achieveNewList.get(i);
+ if(StringUtils.isBlank(item.getPayMethod())){
+ List<SysOrderFlow> orderFlows = orderFlowDao.selectByOrderId(item.getOrderId());
+ if(orderFlows.size()==1){
+ if(orderFlows.get(0).getPayMethod().equals("现金支付")){
+ xjs.add(item.getId());
+ }else{
+ hks.add(item.getId());
+ }
+ }else{
+ ids.add(item.getOrderId());
+ }
+ }
+ }
+ if(CollectionUtils.isNotEmpty(xjs)){
+ achieveNewDao.setPayMethod("现金",xjs);
+ }
+ if(CollectionUtils.isNotEmpty(hks)){
+ achieveNewDao.setPayMethod("划扣",hks);
+ }
+ System.out.println("未处理订单id"+ StringUtils.collToStr(ids,","));
}
}
--
Gitblit v1.9.1