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

修改耗材库存

Browse Source
This commit is contained in:
韩鹏辉
2024-06-28 09:39:14 +08:00
parent e91636a188
commit 75ec8fc9e5
36 changed files with 788 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java
View File

@@ -1,7 +1,6 @@
package com.chaozhanggui.system.cashierservice.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.chaozhanggui.system.cashierservice.dao.TbCashierCartMapper;
import com.chaozhanggui.system.cashierservice.dao.TbConsInfoFlowMapper;
@@ -17,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
@Slf4j
@@ -70,15 +68,15 @@ public class ConsService {
for (TbProskuCon tbProskuCon : tbProskuCons) {
TbConsInfo tbConsInfo= tbConsInfoMapper.selectByPrimaryKey(tbProskuCon.getConInfoId());
if(Objects.nonNull(tbConsInfo)){
ConsInfoPO consInfoPO=new ConsInfoPO(tbConsInfo.getId(),tbConsInfo.getSurplusStock());
ConsInfoPO consInfoPO=new ConsInfoPO(tbConsInfo.getId(),tbProskuCon.getSurplusStock());
consInfoPOS.add(consInfoPO);
TbConsInfoFlow flow=new TbConsInfoFlow();
flow.setConsId(tbConsInfo.getId());
flow.setShopId(tbConsInfo.getShopId());
flow.setConName(tbConsInfo.getConName());
flow.setAmount(tbConsInfo.getSurplusStock());
flow.setBalance(tbConsInfo.getStockNumber().subtract(tbConsInfo.getSurplusStock()));
flow.setAmount(tbProskuCon.getSurplusStock());
flow.setBalance(tbConsInfo.getStockNumber().subtract(tbProskuCon.getSurplusStock()));
flow.setBizCode("createCart");
flow.setBizName("加入购物陈消耗");
flow.setBizType("-");
@@ -121,15 +119,15 @@ public class ConsService {
for (TbProskuCon tbProskuCon : tbProskuCons) {
TbConsInfo tbConsInfo= tbConsInfoMapper.selectByPrimaryKey(tbProskuCon.getConInfoId());
if(Objects.nonNull(tbConsInfo)){
ConsInfoPO consInfoPO=new ConsInfoPO(tbConsInfo.getId(),tbConsInfo.getSurplusStock().negate());
ConsInfoPO consInfoPO=new ConsInfoPO(tbConsInfo.getId(),tbProskuCon.getSurplusStock().negate());
consInfoPOS.add(consInfoPO);
TbConsInfoFlow flow=new TbConsInfoFlow();
flow.setConsId(tbConsInfo.getId());
flow.setShopId(tbConsInfo.getShopId());
flow.setConName(tbConsInfo.getConName());
flow.setAmount(tbConsInfo.getSurplusStock());
flow.setBalance(tbConsInfo.getStockNumber().add(tbConsInfo.getSurplusStock()));
flow.setAmount(tbProskuCon.getSurplusStock());
flow.setBalance(tbConsInfo.getStockNumber().add(tbProskuCon.getSurplusStock()));
flow.setBizCode("cancelCart");
flow.setBizName("取消购物车返回");
flow.setBizType("+");

4
src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
View File

@@ -75,7 +75,7 @@ public class MemberService {
public Result queryMember(String shopId, String phone, int page, int pageSize) {
PageHelper.startPage(page, pageSize);
PageHelperUtil.startPage(page, pageSize);
List<TbShopUser> tbShopUsers = tbShopUserMapper.selectByShopId(shopId, phone);
PageInfo pageInfo = new PageInfo(tbShopUsers);
return Result.success(CodeEnum.SUCCESS, pageInfo);
@@ -619,7 +619,7 @@ public class MemberService {
if (ObjectUtil.isEmpty(memberId)) {
return Result.fail(CodeEnum.PARAM);
}
PageHelper.startPage(page, pageSize);
PageHelperUtil.startPage(page, pageSize);
List<Map<String, Object>> list = tbShopUserFlowMapper.selectByMemberAccountFlow(memberId);
PageInfo pageInfo = new PageInfo(list);
return Result.success(CodeEnum.SUCCESS, pageInfo);

22
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@@ -12,7 +12,6 @@ import com.chaozhanggui.system.cashierservice.rabbit.RabbitProducer;
import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
import com.chaozhanggui.system.cashierservice.sign.Result;
import com.chaozhanggui.system.cashierservice.util.*;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -25,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import static com.chaozhanggui.system.cashierservice.sign.CodeEnum.CARTEXIST;
@@ -63,6 +63,8 @@ public class OrderService {
@Autowired
RabbitProducer producer;
private static ConcurrentHashMap<String, HashSet<Integer>> codeMap = new ConcurrentHashMap<>();
private static ConcurrentHashMap<String, HashSet<String>> userMap = new ConcurrentHashMap<>();
@@ -106,6 +108,13 @@ public class OrderService {
}
}
JSONObject objectMsg=new JSONObject();
objectMsg.put("skuId",skuWithBLOBs.getId());
objectMsg.put("shopId",shopInfo.getId());
producer.con_msg(objectMsg.toString());
if (StringUtils.isEmpty(masterId)) {
boolean flag = redisUtil.exists("SHOP:CODE:" + clientType + ":" + shopId);
if (flag) {
@@ -755,7 +764,7 @@ public class OrderService {
public Result findOrder(Integer shopId, String status, Integer page, Integer size, String orderNo) {
String day = DateUtils.getDay();
PageHelper.startPage(page, size);
PageHelperUtil.startPage(page, size);
String orderType = "";
if (StringUtils.isNotEmpty(status)) {
if (status.equals("refund")) {
@@ -949,6 +958,9 @@ public class OrderService {
private String secrete;
@Value("${subscribe.message.miniprogramState}")
private String miniprogramState;
public Result sendMassage(String orderId){
if(ObjectUtil.isEmpty(orderId)){
return Result.fail(CodeEnum.ERRMASTER);
@@ -1009,7 +1021,7 @@ public class OrderService {
object1.put("data",data);
object1.put("miniprogram_state","trial");
object1.put("miniprogram_state",miniprogramState);
object1.put("lang","zh_CN");
String response= HttpRequest.post("https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=".concat(accessToken)).body(object1.toString()).execute().body();
@@ -1097,7 +1109,7 @@ public class OrderService {
object1.put("data",data);
object1.put("miniprogram_state","trial");
object1.put("miniprogram_state",miniprogramState);
object1.put("lang","zh_CN");
String response= HttpRequest.post("https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=".concat(accessToken)).body(object1.toString()).execute().body();
@@ -1130,7 +1142,7 @@ public class OrderService {
public Result getOutNumber(String shopId,Integer page,Integer pageSize){
PageHelper.startPage(page, pageSize);
PageHelperUtil.startPage(page, pageSize);
List<TbOrderOutNumber> list= tbOrderOutNumberMapper.selectAll(shopId);
PageInfo pageInfo=new PageInfo(list);
return Result.success(CodeEnum.SUCCESS,pageInfo);

2
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -1099,7 +1099,7 @@ public class PayService {
String shopId = info.getString("shopId");
String staffId = info.getString("staffId");
PageHelper.startPage(pageNo, pageSize);
PageHelperUtil.startPage(pageNo, pageSize);
List<TbQuickPay> list = tbQuickPayMapper.selectByShopIdAndStaffId(Integer.valueOf(shopId), Integer.valueOf(staffId));

9
src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
View File

@@ -7,7 +7,7 @@ import com.chaozhanggui.system.cashierservice.entity.vo.ShopCategoryVo;
import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
import com.chaozhanggui.system.cashierservice.sign.Result;
import com.chaozhanggui.system.cashierservice.util.DateUtils;
import com.github.pagehelper.PageHelper;
import com.chaozhanggui.system.cashierservice.util.PageHelperUtil;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,14 +38,14 @@ public class ProductService {
public Result queryCategory(String shopId,Integer page,Integer pageSize){
PageHelper.startPage(page, pageSize);
PageHelperUtil.startPage(page, pageSize);
List<TbShopCategory> list=tbShopCategoryMapper.selectByAll(shopId);
PageInfo pageInfo=new PageInfo(list);
return Result.success(CodeEnum.SUCCESS,pageInfo);
}
public Result queryAllCategory(String shopId,Integer page,Integer pageSize){
PageHelper.startPage(page, pageSize);
PageHelperUtil.startPage(page, pageSize);
List<ShopCategoryVo> list=tbShopCategoryMapper.queryAllCategory(shopId);
PageInfo pageInfo=new PageInfo(list);
return Result.success(CodeEnum.SUCCESS,pageInfo);
@@ -94,8 +94,7 @@ public class ProductService {
public Result queryNewCommodityInfo(String shopId, String categoryId, String commdityName, int page, int pageSize, String masterId) {
List<TbProductWithBLOBs> tbProductWithBLOBs=null;
PageHelper.startPage(page,pageSize);
PageHelper.startPage(page,pageSize);
PageHelperUtil.startPage(page,pageSize);
if(ObjectUtil.isEmpty(categoryId)){
tbProductWithBLOBs=tbProductMapper.selectByShopId(shopId,commdityName);
}else {

7
src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java
View File

@@ -7,6 +7,7 @@ import com.chaozhanggui.system.cashierservice.entity.*;
import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
import com.chaozhanggui.system.cashierservice.sign.Result;
import com.chaozhanggui.system.cashierservice.util.DateUtils;
import com.chaozhanggui.system.cashierservice.util.PageHelperUtil;
import com.chaozhanggui.system.cashierservice.util.TokenUtil;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -44,7 +45,7 @@ public class ShopInfoService {
return Result.fail(CodeEnum.PARAM);
}
PageHelper.startPage(page, pageSize);
PageHelperUtil.startPage(page, pageSize);
List<TbShopTable> shopTables=tbShopTableMapper.selectByShopIdAndStatus(shopId,areaId,status);
PageInfo pageInfo=new PageInfo(shopTables);
return Result.success(CodeEnum.SUCCESS,pageInfo);
@@ -64,7 +65,7 @@ public class ShopInfoService {
// ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByShopIdAndTrade(shopId,day);
// List<String> list = shopUserDutyMapper.selectByShopIdAndTradeAll(shopId,day,tbToken.getId());
if (Objects.nonNull(shopUserDuty)){
// PageHelper.startPage(page, pageSize);
// PageHelperUtil.startPage(page, pageSize);
List<ShopUserDutyDetail> shopTables=shopUserDutyDetailMapper.selectAllByDuctId(shopUserDuty.getId());
// PageInfo pageInfo=new PageInfo(shopTables);
shopUserDuty.setDetailList(shopTables);
@@ -82,7 +83,7 @@ public class ShopInfoService {
public Result queryDutyFlow(String token, String shopId, int page, int pageSize) {
// JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
// String userId = jsonObject.getString("accountId");
PageHelper.startPage(page, pageSize);
PageHelperUtil.startPage(page, pageSize);
PageHelper.orderBy("login_out_time desc");
List<ShopUserDuty> list = shopUserDutyMapper.selectByShopId(shopId);
PageInfo pageInfo=new PageInfo(list);

4
src/main/java/com/chaozhanggui/system/cashierservice/service/TbGroupOrderInfoService.java
View File

@@ -13,7 +13,7 @@ import com.chaozhanggui.system.cashierservice.entity.vo.ProductVo;
import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
import com.chaozhanggui.system.cashierservice.sign.Result;
import com.chaozhanggui.system.cashierservice.util.JSONUtil;
import com.github.pagehelper.PageHelper;
import com.chaozhanggui.system.cashierservice.util.PageHelperUtil;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -109,7 +109,7 @@ public class TbGroupOrderInfoService {
}
public Result queryByPage(GroupOrderDto param) {
PageHelper.startPage(param.getPage(), param.getSize());
PageHelperUtil.startPage(param.getPage(), param.getSize());
return Result.success(CodeEnum.SUCCESS, new PageInfo(tbGroupOrderInfoMapper.queryList(param)));
}

4
src/main/java/com/chaozhanggui/system/cashierservice/service/TbPrintPCMachineService.java
View File

@@ -8,7 +8,7 @@ import com.chaozhanggui.system.cashierservice.entity.dto.PrintMachineDto;
import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
import com.chaozhanggui.system.cashierservice.sign.Result;
import com.chaozhanggui.system.cashierservice.util.JSONUtil;
import com.github.pagehelper.PageHelper;
import com.chaozhanggui.system.cashierservice.util.PageHelperUtil;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
@@ -60,7 +60,7 @@ public class TbPrintPCMachineService {
* @return 查询结果
*/
public Result queryByPage(TbPrintPCMachine tbPrintMachine) {
PageHelper.startPage(tbPrintMachine.getPage(), tbPrintMachine.getPageSize());
PageHelperUtil.startPage(tbPrintMachine.getPage(), tbPrintMachine.getPageSize());
tbPrintMachine.setContentType("local");
List<TbPrintPCMachine> tbPrintMachines = this.tbPrintMachineMapper.queryAll(tbPrintMachine);