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-08-05 14:44:05 +08:00
parent 8d600dfbe8
commit 5ed9c3abef
2 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.chaozhanggui.system.cashierservice.dao.*;
import com.chaozhanggui.system.cashierservice.entity.*;
import com.chaozhanggui.system.cashierservice.entity.po.ConsInfoPO;
import com.chaozhanggui.system.cashierservice.util.N;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -90,7 +91,6 @@ public class ConsService {
flow.setBizType("-");
tbConsInfo.setStockConsume(tbConsInfo.getStockConsume().add(amount));
flow.setBalance(tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()));
tbConsInfo.setUpdateTime(new Timestamp(System.currentTimeMillis()));
}else if("delete".equals(type)){
@@ -103,11 +103,25 @@ public class ConsService {
tbConsInfo.setStockConsume(tbConsInfo.getStockConsume().add(amount));
flow.setBalance(tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()));
tbConsInfo.setUpdateTime(new Timestamp(System.currentTimeMillis()));
}
// ConsInfoPO consInfoPO=new ConsInfoPO(tbConsInfo.getId(),amount);
// consInfoPOS.add(consInfoPO);
if(N.gt(BigDecimal.ZERO,tbConsInfo.getStockNumber())){
if(N.gt(BigDecimal.ZERO,tbConsInfo.getStockConsume())){
flow.setBalance(tbConsInfo.getStockNumber().add(tbConsInfo.getStockConsume()));
}else {
flow.setBalance(tbConsInfo.getStockNumber().add(tbConsInfo.getStockConsume().negate()));
}
}else {
if(N.gt(BigDecimal.ZERO,tbConsInfo.getStockConsume())){
flow.setBalance(tbConsInfo.getStockNumber().add(tbConsInfo.getStockConsume().negate()));
}else {
flow.setBalance(tbConsInfo.getStockNumber().add(tbConsInfo.getStockConsume().negate()));
}
}
flow.setOrderId(tbOrderInfo.getId());
flow.setOrderNo(tbOrderInfo.getOrderNo());

32
src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
View File

@@ -134,6 +134,38 @@ public class DataService {
productInfoPOS,productInfos
);
tbHandover tbHandover=new tbHandover();
if(ObjectUtil.isNotNull(shopStaff)){
tbHandover.setStaffId(shopStaff.getId());
tbHandover.setStaffName(shopStaff.getName());
}
tbHandover.setTradeDay(DateUtils.getDays());
tbHandover.setPrintNo("usb");
tbHandover.setDutyId(shopUserDuty.getId());
tbHandover.setShopId(shopInfo.getId());
tbHandover.setMerchantName(handoverInfo.getMerchantName());
tbHandover.setStartTime(handoverInfo.getStartTime());
tbHandover.setEndTime(handoverInfo.getEndTime());
tbHandover.setPayInfos(JSONUtil.toJSONString(handoverInfo.getPayInfos()));
tbHandover.setMemberData(JSONUtil.toJSONString(handoverInfo.getMemberData()));
tbHandover.setProductCategories(JSONUtil.toJSONString(handoverInfo.getProductCategories()));
tbHandover.setTotalAmount(handoverInfo.getTotalAmount());
tbHandover.setImprest(handoverInfo.getImprest());
tbHandover.setPayable(handoverInfo.getPayable());
tbHandover.setHandIn(handoverInfo.getHandIn());
tbHandover.setReturnAmount(handoverInfo.getReturnAmount());
tbHandover.setOrderNum(handoverInfo.getOrderNum());
tbHandover.setQuickAmount(handoverInfo.getQuickAmount());
tbHandover.setProductInfoPos(JSONUtil.toJSONString(handoverInfo.getProductInfoPOS()));
tbHandover.setProductInfos(JSONUtil.toJSONString(handoverInfo.getProductInfos()));
tbHandover.setCreateTime(new Date());
tbHandoverMapper.insert(tbHandover);
return Result.success(CodeEnum.SUCCESS,handoverInfo);
}else{
HandoverInfo handoverInfo=new HandoverInfo(tbShopInfo.getShopName(),