修改贸易`提交代码

blade-service/store-goods/src/main/java/com/store/goods/controller/GoodsDescController.java

@@ -330,10 +330,14 @@ public class GoodsDescController extends BladeController {
 			goodsRecordLambdaQueryWrapper.eq(GoodsRecord::getTenantId,AuthUtil.getTenantId());
 			goodsRecordLambdaQueryWrapper.eq(GoodsRecord::getUserId,AuthUtil.getUserId());
 		    goodsRecordLambdaQueryWrapper.eq(GoodsRecord::getCategory,category);
+		    goodsRecordLambdaQueryWrapper.orderByDesc(GoodsRecord::getCreateTime);
 			Page<GoodsRecord> page=new Page<>(query.getCurrent(),query.getSize());
 			List<GoodsRecord> goodsRecordList = goodsRecordService.page(page, goodsRecordLambdaQueryWrapper).getRecords();
 			List<Long> goodsDescIds = goodsRecordList.stream().map(GoodsRecord::getGoodsDescId).collect(Collectors.toList());
 
+			//总条数
+			int count = goodsRecordService.count(goodsRecordLambdaQueryWrapper);
+
 			//筛选相关商品记录
 		    LambdaQueryWrapper<GoodsDesc> goodsDescLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		    goodsDescLambdaQueryWrapper.orderByDesc(GoodsDesc::getCreateTime);
@@ -382,26 +386,49 @@ public class GoodsDescController extends BladeController {
 			//浏览记录
 			else if(category==2 && CollectionUtils.isNotEmpty(list))
 			{
+				if(CollectionUtils.isEmpty(goodsRecordList))
+				{
+					return R.data(Collections.EMPTY_LIST);
+				}
 
-				//组装日期和对应数据
-				Map<String,List<GoodsDesc>> map=new HashMap<>();
+				SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
+				//最终返回数据的Map
+				Map resultMap=new HashMap();
+				resultMap.put("total",count);
+				//装载数据的List
+                List<Map<String,Object>> result=new ArrayList<>();
 
 				//对记录的日期进行分组
-				List<Date> DateList = goodsRecordList.stream().map(GoodsRecord::getCreateTime).distinct().collect(Collectors.toList());
-				SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
+				List<Date> DateList= goodsRecordList.stream().map(GoodsRecord::getCreateTime).distinct().collect(Collectors.toList());
+
+				List<String> strDateList=new ArrayList<>();
 				DateList.forEach(e->{
+
+					if(!strDateList.contains(simpleDateFormat.format(e)))
+					{
+						strDateList.add(simpleDateFormat.format(e));
+					}
+
+				});
+
+				strDateList.forEach(e->{
 					List<GoodsDesc> goodsDescList=new ArrayList<>();
 					goodsRecordList.forEach(l->{
 						 //如果日期相等就添加到list
-						 if(simpleDateFormat.format(e).equals(simpleDateFormat.format(l.getCreateTime())))
+						 if(e.equals(simpleDateFormat.format(l.getCreateTime())))
 						 {
 							 goodsDescList.add(goodsDescService.getById(l.getGoodsDescId()));
 						 }
 					});
 					//组装完成数据
-					map.put(simpleDateFormat.format(e),goodsDescList);
+					//组装日期和数据的Map
+					Map<String,Object> map=new HashMap<>();
+					map.put("tiem",e);
+					map.put("list",goodsDescList);
+					result.add(map);
 				});
-				return R.data(map);
+				resultMap.put("data",result);
+				return R.data(resultMap);
 			}
 			return R.data(Collections.EMPTY_LIST);
 

blade-service/trade-finance/src/main/java/com/trade/finance/controller/SettlementController.java

@@ -19,6 +19,7 @@ package com.trade.finance.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.trade.finance.dto.SettlementDTO;
+import com.trade.finance.entity.Acc;
 import com.trade.finance.entity.Items;
 import com.trade.finance.entity.Settlement;
 import com.trade.finance.service.IItemsService;
@@ -167,5 +168,23 @@ public class SettlementController extends BladeController {
 		return R.status(settlementService.removeByIds(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 申请货款(申请/付费)
+	 * */
+	@PostMapping("/apply")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "请货款(收费/付费)", notes = "传入Finance_items")
+	public R apply(@RequestBody  List<Items> itemsList,@RequestParam(value = "billType",required = true) String billType)
+	{
+          if(CollectionUtils.isEmpty(itemsList))
+          {
+          	throw new SecurityException("传入数据不能为空");
+		  }
+		  settlementService.apply(itemsList,billType);
+          return R.success("操作成功");
+	}
+
+
+
 
 }

blade-service/trade-finance/src/main/java/com/trade/finance/service/ISettlementService.java

@@ -20,9 +20,12 @@ package com.trade.finance.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.trade.finance.dto.SettlementDTO;
+import com.trade.finance.entity.Items;
 import com.trade.finance.entity.Settlement;
 import com.trade.finance.vo.SettlementVO;
 
+import java.util.List;
+
 /**
  * 结算表 服务类
  *
@@ -43,4 +46,6 @@ public interface ISettlementService extends IService<Settlement> {
 	/**修改新增收付款信息 */
 	void modify(SettlementDTO settlementDTO);
 
+	void apply(List<Items> itemsList,String billType);
+
 }

blade-service/trade-finance/src/main/java/com/trade/finance/service/impl/SettlementServiceImpl.java

@@ -27,12 +27,15 @@ import com.trade.finance.mapper.ItemsMapper;
 import com.trade.finance.mapper.SettlementMapper;
 import com.trade.finance.service.ISettlementService;
 import com.trade.finance.vo.SettlementVO;
+import org.springblade.client.feign.ISerialClient;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.Date;
 import java.util.List;
@@ -49,6 +52,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
    @Autowired
    private ItemsMapper itemsMapper;
 
+	private ISerialClient serialClient;//生成系统编号
+
 	@Override
 	public IPage<SettlementVO> selectSettlementPage(IPage<SettlementVO> page, SettlementVO settlement) {
 		return page.setRecords(baseMapper.selectSettlementPage(page, settlement));
@@ -127,4 +132,29 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 	}
 
+	@Override
+	@Transactional
+	public void apply(List<Items> itemsList, String billType)
+	{
+           Settlement settlement=new Settlement();
+		   settlement.setBillType(billType);
+		   settlement.setCorpId(itemsList.get(0).getCorpId());
+		   //todo 系统编号暂时按时间戳, 后续按正式
+		   settlement.setSysNo(String.valueOf(System.currentTimeMillis()));
+		   settlement.setCreateTime(new Date());
+		   settlement.setTenantId(AuthUtil.getTenantId());
+		   settlement.setCreateUser(AuthUtil.getUserId());
+		   settlement.setStatus(0);
+		   baseMapper.insert(settlement);
+
+		   itemsList.forEach(e->{
+		   	   e.setPid(settlement.getId());
+			   e.setCreateTime(new Date());
+			   e.setTenantId(AuthUtil.getTenantId());
+			   e.setCreateUser(AuthUtil.getUserId());
+			   itemsMapper.insert(e);
+		   });
+
+	}
+
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -97,9 +97,18 @@ public class PurchaseOrderController extends BladeController {
 					 			 @RequestParam(value = "orderNo",required = false) String orderNo,//合同号
 					 			 @RequestParam(value = "tradeType",required = false) String tradeType,//贸易类型
 								 @RequestParam(value = "strCorpName",required = false) String strCorpName,//供应商名称
+								 @RequestParam(value = "corpId",required = false) String corpId,//供应商id
 								 @RequestParam(value = "strPurchaserName",required = false) String strPurchaserName,//采购商名称
 								 @RequestParam(value = "salesName",required = false) String salesName,//业务员
 
+					             @RequestParam(value = "banksAccountName",required = false) String banksAccountName,//公司户头
+								  @RequestParam(value = "packageRemarks",required = false) String packageRemarks,//包装要求
+								  @RequestParam(value = "createUser",required = false) Long createUser,//制单人
+					             @RequestParam(value = "paymentType",required = false) String paymentType,//付款方式
+					             @RequestParam(value = "createStartTime",required = false) String createStartTime,//制单日期
+					             @RequestParam(value = "createEndTime",required = false) String createEndTime,//制单日期
+
+
 								 @RequestParam(value = "businesStartDate",required = false) String businesStartDate,//订单开始时间  busines_date
 								 @RequestParam(value = "businesEndDate",required = false) String businesEndDate,//订单结束时间
 								 @RequestParam(value = "accountsCollectionStartDate",required = false) String accountsCollectionStartDate,//应收(付)款开始时间  accounts_collection_date
@@ -155,12 +164,18 @@ public class PurchaseOrderController extends BladeController {
 			}
 
 		}
+		queryWrapper.like(StringUtils.isNotBlank(banksAccountName),"banks_account_name",banksAccountName);
+		queryWrapper.like(StringUtils.isNotBlank(packageRemarks),"package_remarks",packageRemarks);
 		queryWrapper.like(StringUtils.isNotBlank(salesName),"sales_name",salesName);
 		queryWrapper.like(StringUtils.isNotBlank(orderNo),"order_no",orderNo);
+		queryWrapper.like(StringUtils.isNotBlank(paymentType),"payment_type",paymentType);
+		queryWrapper.eq(StringUtils.isNotBlank(corpId),"corp_id",corpId);
 		queryWrapper.eq("tenant_id",AuthUtil.getTenantId());
+		queryWrapper.eq(createUser!=null,"create_user",createUser);
 		queryWrapper.eq("bill_type",OrderTypeEnum.PURCHASE.getType());
 		queryWrapper.eq("trade_type",order.getTradeType());
 		queryWrapper.like(StringUtils.isNotBlank(billNo),"bill_no",billNo);
+		queryWrapper.between(StringUtils.isNotBlank(createStartTime)&&StringUtils.isNotBlank(createEndTime),"create_time",createStartTime,createEndTime);
 		queryWrapper.between(StringUtils.isNotBlank(businesStartDate)&&StringUtils.isNotBlank(businesEndDate),"busines_date",businesStartDate,businesEndDate);
 		queryWrapper.between(StringUtils.isNotBlank(accountsCollectionStartDate)&&StringUtils.isNotBlank(accountsCollectionEndDate),"accounts_collection_date",accountsCollectionStartDate,accountsCollectionEndDate);
 		queryWrapper.between(StringUtils.isNotBlank(dateOfStartArrival)&&StringUtils.isNotBlank(dateOfEndArrival),"date_of_arrival",dateOfStartArrival,dateOfEndArrival);
@@ -215,7 +230,7 @@ public class PurchaseOrderController extends BladeController {
 
 					//子项总收货数
 					BigDecimal actualQuantity = orderItemsList.stream().filter(it -> it.getActualQuantity() != null)
-						.map(OrderItems::getOrderQuantity)
+						.map(OrderItems::getActualQuantity)
 						.reduce(BigDecimal.ZERO, BigDecimal::add);
 					e.setActualQuantity(actualQuantity);
 				}