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

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

Browse Source
This commit is contained in:
SongZhang
2024-07-25 15:01:41 +08:00
parent d7223fe70b 2aa2afbd2b
commit e91ae3bd8d
6 changed files with 107 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -670,6 +670,10 @@ public class CloudPrinterService {
String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}";
PrinterUtils.printTickets(voiceJson,1,1,it.getAddress(),PrinterUtils.handoverprintData(handoverInfo));
});
return Result.success(CodeEnum.SUCCESS);

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

@@ -49,6 +49,9 @@ public class DataService {
@Autowired
ShopUserDutyPayMapper shopUserDutyPayMapper;
@Autowired
tbHandoverMapper tbHandoverMapper;
public Result handoverprintData(String token, Integer id){
@@ -104,6 +107,11 @@ public class DataService {
}
List<ProductInfoPO> productInfoPOS = shopUserDutyPayMapper.selectProductByDutyId(shopUserDuty.getId());
List<ProductInfo> productInfos = shopUserDutyMapper.selectByDutyId(shopUserDuty.getId());
HandoverInfo handoverInfo=new HandoverInfo(tbShopInfo.getShopName(),
ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime())? DateUtils.getTime(shopUserDuty.getLoginTime()):null,
ObjectUtil.isNotEmpty(shopUserDuty.getLoginOutTime())?DateUtils.getTime(shopUserDuty.getLoginOutTime()):"",
@@ -115,7 +123,7 @@ public class DataService {
shopUserDuty.getReturnAmount().toPlainString(),
shopUserDuty.getOrderNum().toString(),
productCategories,ObjectUtil.isNull(shopUserDuty.getQuickAmount())?"0":shopUserDuty.getQuickAmount().toPlainString(),
null,null
productInfoPOS,productInfos
);
@@ -213,8 +221,33 @@ public class DataService {
);
tbHandover tbHandover=new tbHandover();
tbHandover.setTradeDay(DateUtils.getDays());
tbHandover.setPrintNo(it.getAddress());
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);
String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}";
PrinterUtils.printTickets(voiceJson, 1, 1, it.getAddress(), PrinterUtils.handoverprintData(handoverInfo));
});
}