czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
SongZhang
2024-09-26 17:49:18 +08:00
parent 1db4743ac8 e5f632c036
commit 6686f0c549
14 changed files with 72 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
View File

@@ -83,7 +83,7 @@ public class SummaryServiceImpl implements SummaryService {
//会员 充值金额 inAmount /退款金额 outAmount /会员消费金额 useAmount /会员消费笔数 useNum
Map<String, Object> flowMap = tbShopUserFlowMapper.tradeIndexFlow(param.getShopId(), DateUtil.getStrTime(param.getStartTime()), DateUtil.getStrTime(param.getEndTime()));
// 新增会员数
Integer newFlow = tbShopUserRepository.newFlow(param.getShopId().toString(), DateUtil.getStrTime(param.getStartTime()), DateUtil.getStrTime(param.getEndTime()));
Integer newFlow = tbShopUserRepository.newFlow(param.getShopId().toString(), param.getStartTime(), param.getEndTime());
// Integer newFlow = tbShopUserFlowMapper.tradeIndexNewFlow(param.getShopId(), DateUtil.getStrTime(param.getStartTime()), DateUtil.getStrTime(param.getEndTime()));
//台桌数
int tables = tbShopTableRepository.countAllByShopId(param.getShopId());
@@ -117,22 +117,28 @@ public class SummaryServiceImpl implements SummaryService {
BigDecimal payAmount = new BigDecimal(payCountVo.getPayAmount().toString());
switch (payCountVo.getPayType()){
case "微信小程序":
payCountVo.setPayAmount(payAmount.add(payCountMap.get("wx_lite")));
payCountVo.setPayAmount(payCountMap.containsKey("wx_lite")?payAmount.add(payCountMap.get("wx_lite")):payAmount);
break;
case "支付宝小程序":
payCountVo.setPayAmount(payAmount.add(payCountMap.get("ali_lite")));
payCountVo.setPayAmount(payCountMap.containsKey("ali_lite")?payAmount.add(payCountMap.get("ali_lite")):payAmount);
break;
case "主扫收款":
payCountVo.setPayAmount(payAmount.add(payCountMap.get("scanCode")));
payCountVo.setPayAmount(payCountMap.containsKey("scanCode")?payAmount.add(payCountMap.get("scanCode")):payAmount);
break;
case "收款码收款":
payCountVo.setPayAmount(payAmount.add(payCountMap.get("ALIPAY")).add(payCountMap.get("WECHAT")));
if(payCountMap.containsKey("ALIPAY")){
payAmount = payAmount.add(payCountMap.get("ALIPAY"));
}
if(payCountMap.containsKey("WECHAT")){
payAmount = payAmount.add(payCountMap.get("WECHAT"));
}
payCountVo.setPayAmount(payAmount);
break;
case "现金":
payCountVo.setPayAmount(payAmount.add(payCountMap.get("cash")));
payCountVo.setPayAmount(payCountMap.containsKey("cash")?payAmount.add(payCountMap.get("cash")):payAmount);
break;
case "会员":
payCountVo.setPayAmount(payAmount.add(payCountMap.get("deposit")));
payCountVo.setPayAmount(payCountMap.containsKey("deposit")?payAmount.add(payCountMap.get("deposit")):payAmount);
break;
case "充值":
payCountVo.setPayAmount(payAmount.add(vipSaveAmount));

22
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
View File

@@ -208,6 +208,7 @@ public class StockServiceImpl implements StockService {
stockDetail.setUpdatedAt(System.currentTimeMillis());
stockDetail.setSourcePath("SHOP");
stockDetail.setRemark("一次性入库覆盖库存");
stockDetail.setOperator(SecurityUtils.getCurrentUsername());
if ("sku".equals(productIdStr)) {
Optional<TbProductSku> byId = skuRepository.findById(Double.valueOf(row.getCell(2).toString()).intValue());
if (byId.isPresent()) {
@@ -393,6 +394,27 @@ public class StockServiceImpl implements StockService {
case "stockNumber"://库存
description.append(" 库存数量修改为:"+updateValueVO.getValue()+" 原库存:"+product.getStockNumber());
sqlQuery.append(" set stock_number = ").append(updateValueVO.getValue());
TbProductStockDetail detail=new TbProductStockDetail();
detail.setProductId(product.getId().toString());
detail.setProductName(product.getName());
detail.setShopId(product.getShopId());
detail.setOperator(SecurityUtils.getCurrentUsername());
detail.setSourcePath("NORMAL");
detail.setLeftNumber(product.getStockNumber());
detail.setStockNumber(new Double(Integer.valueOf(updateValueVO.getValue())-product.getStockNumber()));
TbShopUnit tbShopUnit = shopUnitRepository.findById(product.getUnitId()).orElse(null);
if(tbShopUnit!=null){
detail.setUnitName(tbShopUnit.getName());
}
if (product.getStockNumber() > Integer.valueOf(updateValueVO.getValue())) {
detail.setSubType(-1);
detail.setType("盘点出库");
} else {
detail.setSubType(1);
detail.setType("盘点入库");
}
detail.setCreatedAt(System.currentTimeMillis());
tbProductStockDetailRepository.save(detail);
break;
case "salePrice"://价格
description.append("修改价格为" + updateValueVO.getValue());

8
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
View File

@@ -103,21 +103,17 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
-> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
Page<TbProductStockDetailDto> map = page.map(tbProductStockDetailMapper::toDto);
ArrayList<Map<String, Object>> contents = new ArrayList<>();
for (TbProductStockDetailDto tbProductStockDetailDto : map.getContent()) {
Map<String, Object> map1 = BeanUtil.transBean2Map(tbProductStockDetailDto);
if (StrUtil.isNotBlank(tbProductStockDetailDto.getOrderId())) {
TbOrderInfo tbOrderInfo = tbOrderInfoRepository.findById(Integer.valueOf(tbProductStockDetailDto.getOrderId())).orElse(null);
if (tbOrderInfo != null) {
map1.put("orderNo", tbOrderInfo.getOrderNo());
tbProductStockDetailDto.setOrderNo(tbOrderInfo.getOrderNo());
}
}
contents.add(map1);
tbProductStockDetailDto.setTypes();
}
Map<String,Object> info = new LinkedHashMap<>(2);
info.put("content",contents);
info.put("content",map.getContent());
info.put("totalElements",page.getTotalElements());
return info;
}

1
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java
View File

@@ -501,6 +501,7 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe
productStockDetail.setStockSnap(JSONObject.toJSONString(snapItem));
productStockDetail.setSourcePath("CASHIER");
productStockDetail.setRemark(stockRecordMsg.getRemark());
productStockDetail.setOperator(stockRecordMsg.getOperator());
productStockDetailRepository.save(productStockDetail);
}