diff --git a/client/src/main/java/com/small/client/dao/SxDataDao.java b/client/src/main/java/com/small/client/dao/SxDataDao.java index 5329c644..fb915c71 100644 --- a/client/src/main/java/com/small/client/dao/SxDataDao.java +++ b/client/src/main/java/com/small/client/dao/SxDataDao.java @@ -9,6 +9,7 @@ import com.google.gson.Gson; import com.small.client.Utils.BigDecimalFormatter; import com.small.client.Utils.CommonUtil; import com.small.client.Utils.HttpUtils; +import com.small.client.Utils.SqlBuilder; import com.small.client.dto.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.math.NumberUtils; @@ -20,6 +21,7 @@ import org.springframework.web.client.RestTemplate; import java.math.BigDecimal; import java.math.RoundingMode; import java.sql.*; +import java.sql.Date; import java.util.*; import java.util.stream.Collectors; @@ -50,6 +52,8 @@ public class SxDataDao extends BaseDao{ //private final static String T_IM_BRANCH_STOCK="t_im_branch_stock";//库存表 + private final static String T_BD_BRANCH_INFO="t_bd_branch_info";//仓库表 + private final static String T_IM_BRANCH_STOCK="(" + "select * from( " + " select ROW_NUMBER() OVER( " + @@ -470,17 +474,21 @@ public class SxDataDao extends BaseDao{ * @param dataBaseInfo * @param map */ - public void updateStoreData(DataBaseInfo dataBaseInfo, Map map,List productQuantityConsumptionDtoList, + public void updateStoreData(DataBaseInfo dataBaseInfo, Map map,Map pqMap,List productQuantityConsumptionDtoList, CommentModel commentModel){ if(CollectionUtil.isEmpty(map)){ log.info("同步数据为空"); return; } - Connection conn =getConnection(dataBaseInfo.getIp(),dataBaseInfo.getUserName(), + String brachNo=getLocalBranch(dataBaseInfo);//获取总店铺分仓编号 + Map itemInfoMap= findItemInfoList(dataBaseInfo,map);//查询商品信息 + Connection conn =getConnection(dataBaseInfo.getIp(),dataBaseInfo.getUserName(), dataBaseInfo.getPassword(), dataBaseInfo.getDbPort(),dataBaseInfo.getDataBaseName()); try { conn.setAutoCommit(false); // 关闭自动提交，开启事务 //String sql = "update t_im_branch_stock set stock_qty= stock_qty+(?),oper_date=? where item_no=?"; + List rmSaleflowList=new ArrayList<>(); + List tRmPayflowList=new ArrayList<>(); String sql = "WITH TopStock AS ( " + " SELECT TOP(1) * " + " FROM t_im_branch_stock " + @@ -491,15 +499,29 @@ public class SxDataDao extends BaseDao{ " SET stock_qty = stock_qty+(?),oper_date=?;"; Timestamp timestamp = new Timestamp(System.currentTimeMillis()); try (PreparedStatement ps = conn.prepareStatement(sql)) { - int batchSize = 1000; // 每批处理1000条 + int batchSize = 100; // 每批处理1000条 int count = 0; Set sme=map.entrySet(); for (Map.Entry entry : sme) { + BigDecimal stock_qty= (BigDecimal) entry.getValue(); if(stock_qty.compareTo(BigDecimal.ZERO)==0){ continue; } - ps.setString(1, (String) entry.getKey()); + String itemNo = (String) entry.getKey(); + ProductQuantityConsumptionDto productQuantityConsumptionDto=pqMap.get(itemNo); + BigDecimal unitPrice = productQuantityConsumptionDto.getUnitPrice(); + RmSaleflow rmSaleflow=new RmSaleflow(); + rmSaleflow.setItemNo(itemNo); + rmSaleflow.setSalePrice(unitPrice); + rmSaleflow.setSaleQnty(stock_qty); + rmSaleflow.setFlownoRand(productQuantityConsumptionDto.getOrderId());//随机子单号 设置网上订单号 + rmSaleflow= fixRmSaleFlow(rmSaleflow,brachNo,itemInfoMap); + TRmPayflow trmPayflow=fixTRmPayflow(rmSaleflow); + + rmSaleflowList.add(rmSaleflow); + + ps.setString(1, itemNo); ps.setDouble(2, stock_qty.doubleValue()); ps.setTimestamp(3, timestamp); ps.addBatch(); // 添加至批处理 @@ -513,6 +535,9 @@ public class SxDataDao extends BaseDao{ // 执行剩余未满 batchSize 的批次 int[] remainingCounts = ps.executeBatch(); + //todo 新增流水 + updateStoreSaleFlow(dataBaseInfo,rmSaleflowList,tRmPayflowList); + List consumIds=productQuantityConsumptionDtoList .stream() .map(ProductQuantityConsumptionDto::getConsumeId) @@ -548,6 +573,310 @@ public class SxDataDao extends BaseDao{ } } + /** + * 补充字段 + * @param rmSaleflow + * @return + */ + public RmSaleflow fixRmSaleFlow(RmSaleflow rmSaleflow,String branchNo,Map itemInfoMap){ + //自定义单号 start + rmSaleflow.setFlowId(1); + String orderId=rmSaleflow.getFlownoRand(); + String[] orderIdSplits= orderId.split("_"); + String DateStr=DateUtil.format(new java.util.Date(),"yyyyMMdd"); + String flowNo="99"+DateStr+orderIdSplits[orderIdSplits.length-1]; + rmSaleflow.setFlowNo(flowNo);//订单号 todo + //自定义 单号 end + + //判断取值 start + rmSaleflow.setSellWay("A"); + rmSaleflow.setRetQnty(rmSaleflow.getSaleQnty()); + if(rmSaleflow.getSaleQnty().compareTo(BigDecimal.ZERO)<0){ + rmSaleflow.setSellWay("B"); + BigDecimal saleQnty=rmSaleflow.getSaleQnty();//销售数量 + rmSaleflow.setSaleQnty(saleQnty); + rmSaleflow.setRetQnty(BigDecimal.ZERO); + } + //判断取值 end + + //数据库查询取值start todo + ItemInfo itemInfo=itemInfoMap.get(rmSaleflow.getItemNo()); + if(itemInfo!=null){ + rmSaleflow.setInPrice(itemInfo.getPrice()); + rmSaleflow.setOperDate(new Date(System.currentTimeMillis())); + } + rmSaleflow.setBranchNo(branchNo); + + //数据库查询取值end + + //远程配置取值start todo + rmSaleflow.setOperId("9999"); + rmSaleflow.setSaleMan("9999"); + rmSaleflow.setCounterNo("9999"); + //远程配置取值end + + //统一默认值 start + rmSaleflow.setNStan(BigDecimal.ZERO); + rmSaleflow.setChrStan("0"); + rmSaleflow.setFlownoType("0"); + rmSaleflow.setPrefAmt(BigDecimal.ZERO); + rmSaleflow.setComFlag("0"); + rmSaleflow.setRemoteFlag("0"); + //统一默认值 end + return rmSaleflow; + } + + /** + * 支付流水赋值 + * @return + */ + public TRmPayflow fixTRmPayflow(RmSaleflow rmSaleflow){ + TRmPayflow rmPayflow=new TRmPayflow(); + rmPayflow.setFlowId(rmSaleflow.getFlowId()); + rmPayflow.setFlowNo(rmSaleflow.getFlowNo()); + BigDecimal saleAmount=rmSaleflow.getSalePrice().multiply(rmSaleflow.getSaleQnty()).setScale(2, RoundingMode.HALF_UP); + rmPayflow.setSaleAmount(saleAmount); + rmPayflow.setBranchNo(rmSaleflow.getBranchNo()); + rmPayflow.setPayWay("RMB");//人民币 + rmPayflow.setSellWay(rmSaleflow.getSellWay()); + rmPayflow.setCardNo(""); + rmPayflow.setVipNo(null); + rmPayflow.setCoinNo("RMB");// + rmPayflow.setCoinRate(new BigDecimal("1"));//利率 + rmPayflow.setPayAmount(saleAmount); + rmPayflow.setOperDate(rmSaleflow.getOperDate()); + rmPayflow.setOperId(rmSaleflow.getOperId()); + rmPayflow.setCounterNo(rmSaleflow.getCounterNo()); + rmPayflow.setSaleMan(rmSaleflow.getSaleMan()); + rmPayflow.setMemo(""); + rmPayflow.setVoucherNo("");//退货单号 退货时要填 + rmPayflow.setRemoteFlag("0"); + rmPayflow.setExchangeFlag(null); + rmPayflow.setShiftNo(""); + rmPayflow.setComFlag("0"); + rmPayflow.setPosid("01"); + rmPayflow.setUptime(null); + rmPayflow.setFlownoRand(rmSaleflow.getFlownoRand()); + rmPayflow.setCiceroniNo("0"); + rmPayflow.setCiceroniId(null); + rmPayflow.setFlownoType(rmSaleflow.getFlownoType()); + rmPayflow.setTransType(null); + rmPayflow.setUpBatchno("");//todo + rmPayflow.setUpVipacc("0"); + rmPayflow.setCashNo("00"); + if("B".equals(rmSaleflow.getSellWay())){//退货 + rmPayflow.setMemo("正常退货"); + rmPayflow.setVoucherNo("");//退货单号 退货时要填 + rmPayflow.setRemoteFlag(""); + rmPayflow.setExchangeFlag("0"); + rmPayflow.setUpVipacc(null); + } + + return rmPayflow; + } + + /** + * 查询商品，返回map + * @param dataBaseInfo + * @param map + * @return + */ + public Map findItemInfoList(DataBaseInfo dataBaseInfo,Map map){ + if(CollectionUtil.isEmpty(map)){ + return null; + } + Map resultMap=new HashMap<>(); + Set sme=map.entrySet(); + String where = "where 1=1"; + List itemNos = sme.stream() + .map(entry -> (String) entry.getKey()) + .collect(Collectors.toList()); + where += SqlBuilder.buildInCondition("item_no", itemNos); + ResultDto resultDto= this.baseFindList(dataBaseInfo.getIp(),dataBaseInfo.getUserName(),dataBaseInfo.getPassword(), + dataBaseInfo.getDbPort(),dataBaseInfo.getDataBaseName(),T_BD_ITEM_INFO,where); + ResultSet rs= resultDto.getResultSet(); + try { + while (rs.next()) { + ItemInfo itemInfo=new ItemInfo(); + String itemNo=rs.getString("item_no"); + itemInfo.setItemNo(itemNo);// + itemInfo.setItemSubno(rs.getString("item_subno")); + itemInfo.setItemName(rs.getString("item_name")); + itemInfo.setItemBrand(rs.getString("item_brand"));//品牌 + itemInfo.setPrice(rs.getBigDecimal("price"));//进货价 + itemInfo.setItemClsno(rs.getString("item_clsno")); + resultMap.put(itemNo,itemInfo); + } + } catch (SQLException e) { + throw new RuntimeException(e); + } finally { + try { + resultDto.getConnection().close(); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + return resultMap; + } + + /** + * 批量新增销售流水 + * @param dataBaseInfo + * @param rmSaleflowList + */ + public void updateStoreSaleFlow(DataBaseInfo dataBaseInfo,List rmSaleflowList,List payflowList){ + if(CollectionUtil.isEmpty(rmSaleflowList)){ + log.info("销售流水记录为空"); + return; + } + Connection conn =getConnection(dataBaseInfo.getIp(),dataBaseInfo.getUserName(), + dataBaseInfo.getPassword(), dataBaseInfo.getDbPort(),dataBaseInfo.getDataBaseName()); + try { + conn.setAutoCommit(false); // 关闭自动提交，开启事务 + String sql = "INSERT INTO t_rm_saleflow (" + + "flow_id, flow_no, branch_no, item_no, source_price, sale_price, " + + "sale_qnty, sale_money, sell_way, oper_id, sale_man, counter_no, " + + "oper_date, remote_flag, shift_no, com_flag, spec_flag, pref_amt, " + + "in_price, n_stan, chr_stan, posid, uptime, flowno_rand, ret_qnty, " + + "flowno_type, spec_sheet_no, cic_sheet_no, share_cardid, item_no_Fresh" + + ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + String sql2 = "INSERT INTO t_rm_payflow (" + + "flow_id, flow_no, sale_amount, branch_no, pay_way, sell_way, " + + "card_no, vip_no, coin_no, coin_rate, pay_amount, oper_date, " + + "oper_id, counter_no, sale_man, memo,remote_flag, " + + "exchange_flag, shift_no, com_flag, uptime, flowno_rand, " + + "ciceroni_no, ciceroni_id, flowno_type, trans_type, up_batchno, " + + "remark, cash_no" + + ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + try { + PreparedStatement ps = conn.prepareStatement(sql);//销售流水 + PreparedStatement ps2 = conn.prepareStatement(sql2);//资金流水 + int batchSize = 10; // 每批处理10条 + int count = 0; + for (int i=0;i productQuantityConsumptionDtoMap=new HashMap<>(); + + productQuantityConsumptionDtoList.forEach(productQuantityConsumptionDto -> { + productQuantityConsumptionDtoMap.put(productQuantityConsumptionDto.getProductNumber(),productQuantityConsumptionDto); + }); + + sxDataDao.updateStoreData(dataBaseInfo,map,productQuantityConsumptionDtoMap,productQuantityConsumptionDtoList,commentModel); } } @@ -812,6 +818,9 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService dataBaseInfo.setWhere(where); total = sxDataDao.getTotalSpecShop(dataBaseInfo); if(total==0){ + HttpUtils.postData(restTemplate,remoteIp+HttpUtils.URL_SYNC_REFRESH + +"?appKey="+commentModel.getAppKey() + +"&sign="+commentModel.getAppId(), new JSONArray()); log.info("暂无活动商品同步"); return; }