From caa15383382af86c00f7176c1d24280a7da6d9e2 Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Sat, 30 Oct 2021 09:38:59 +0800 Subject: [PATCH] 新增自动配料配置 --- zq-erp/src/test/java/com/matrix/TcProjTest.java | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 40 insertions(+), 6 deletions(-) diff --git a/zq-erp/src/test/java/com/matrix/TcProjTest.java b/zq-erp/src/test/java/com/matrix/TcProjTest.java index a6c485c..c1e7cf5 100644 --- a/zq-erp/src/test/java/com/matrix/TcProjTest.java +++ b/zq-erp/src/test/java/com/matrix/TcProjTest.java @@ -1,14 +1,19 @@ package com.matrix; -import cn.hutool.core.collection.CollUtil; -import com.matrix.system.hive.bean.SysProjUse; +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; /** @@ -23,11 +28,40 @@ @Autowired private SysProjUseDao sysProjUseDao; + @Autowired + AchieveNewDao achieveNewDao; + + @Autowired + SysOrderFlowDao orderFlowDao; + @Test public void tcProjTest() { -// List<SysProjUse> projUses = sysProjUseDao.selectTaoCanListWithProj(); -// if (CollUtil.isNotEmpty(projUses)) { -// -// } + 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