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-28 09:57:23 +08:00
parent 6dcd8368a0
commit acf7e71769
12 changed files with 312 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,7 +189,7 @@ public class CloudPrinterService {
if(ObjectUtil.isNotEmpty(detailList)&&detailList.size()>0){
// OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance, orderInfo.getPayType(), "0", detailList);
OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", ObjectUtil.isEmpty(orderInfo.getMasterId())||ObjectUtil.isNull(orderInfo.getMasterId())?orderInfo.getTableName():orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance, orderInfo.getPayType(), "0", detailList,orderInfo.getRemark());
OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", ObjectUtil.isEmpty(orderInfo.getMasterId())||ObjectUtil.isNull(orderInfo.getMasterId())?orderInfo.getTableName():orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getPayAmount().toPlainString(), balance, orderInfo.getPayType(), "0", detailList,orderInfo.getRemark(),null,null);
detailPO.setOutNumber(orderInfo.getOutNumber());
String printType="退款单";
@@ -251,7 +251,7 @@ public class CloudPrinterService {
}
if(ObjectUtil.isNotEmpty(detailList)&&detailList.size()>0){
OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", orderInfo.getOrderType().equals("miniapp")?orderInfo.getTableName():orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance,(ObjectUtil.isEmpty(orderInfo.getPayType())||ObjectUtil.isNull(orderInfo.getPayType())?"":orderInfo.getPayType() ), "0", detailList,orderInfo.getRemark());
OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", orderInfo.getOrderType().equals("miniapp")?orderInfo.getTableName():orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getPayAmount().toPlainString(), balance,(ObjectUtil.isEmpty(orderInfo.getPayType())||ObjectUtil.isNull(orderInfo.getPayType())?"":orderInfo.getPayType() ), "0", detailList,orderInfo.getRemark(),orderInfo.getDiscountAmount().toPlainString(),orderInfo.getDiscountRatio().toPlainString());
String printType="结算单";
detailPO.setOutNumber(orderInfo.getOutNumber());
@@ -439,7 +439,7 @@ public class CloudPrinterService {
if(ObjectUtil.isNotEmpty(detailList)&&detailList.size()>0){
// OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance, orderInfo.getPayType(), "0", detailList);
OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", ObjectUtil.isEmpty(orderInfo.getMasterId())||ObjectUtil.isNull(orderInfo.getMasterId())?orderInfo.getTableName():orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance, orderInfo.getPayType(), "0", detailList,orderInfo.getRemark());
OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", ObjectUtil.isEmpty(orderInfo.getMasterId())||ObjectUtil.isNull(orderInfo.getMasterId())?orderInfo.getTableName():orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance, orderInfo.getPayType(), "0", detailList,orderInfo.getRemark(),null,null);
String printType="退款单";
@@ -495,7 +495,7 @@ public class CloudPrinterService {
}
}
if(ObjectUtil.isNotEmpty(detailList)&&detailList.size()>0){
OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", orderInfo.getOrderType().equals("miniapp")?orderInfo.getTableName():orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance,(ObjectUtil.isEmpty(orderInfo.getPayType())||ObjectUtil.isNull(orderInfo.getPayType())?"":orderInfo.getPayType() ), "0", detailList,orderInfo.getRemark());
OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", orderInfo.getOrderType().equals("miniapp")?orderInfo.getTableName():orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getPayAmount().toPlainString(), balance,(ObjectUtil.isEmpty(orderInfo.getPayType())||ObjectUtil.isNull(orderInfo.getPayType())?"":orderInfo.getPayType() ), "0", detailList,orderInfo.getRemark(),null,null);
String printType="结算单";
if(ispre){
printType="预结算单";

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

@@ -391,6 +391,20 @@ public class MemberService {
jsonObject.put("amount", memberIn.getAmount());
producer.putOrderCollect(jsonObject.toJSONString());
JSONObject baObj=new JSONObject();
baObj.put("userId",shopUser.getUserId());
baObj.put("shopId",shopInfo.getId());
baObj.put("amount",amount);
baObj.put("balance",shopUser.getAmount());
baObj.put("type","扫码充值");
baObj.put("time",flow.getCreateTime());
producer.balance(baObj.toString());
return Result.success(CodeEnum.SUCCESS, memberIn);
} else if ("TRADE_AWAIT".equals(mainScanResp.getState())) {
@@ -531,6 +545,16 @@ public class MemberService {
producer.putOrderCollect(jsonObject.toJSONString());
JSONObject baObj=new JSONObject();
baObj.put("userId",shopUser.getUserId());
baObj.put("shopId",shopUser.getShopId());
baObj.put("amount",memberIn.getAmount());
baObj.put("balance",shopUser.getAmount());
baObj.put("type","充值");
baObj.put("time",flow.getCreateTime());
producer.balance(baObj.toString());
tbShopUserFlowMapper.insert(flow);
}
return Result.success(CodeEnum.SUCCESS, memberIn);
@@ -671,6 +695,17 @@ public class MemberService {
JSONObject baObj=new JSONObject();
baObj.put("userId",shopUser.getUserId());
baObj.put("shopId",shopInfo.getId());
baObj.put("amount",amount);
baObj.put("balance",shopUser.getAmount());
baObj.put("type","充值");
baObj.put("time",flow.getCreateTime());
producer.balance(baObj.toString());
return Result.success(CodeEnum.SUCCESS);
}

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

@@ -626,6 +626,17 @@ public class PayService {
mqData.put("type", "pc");
producer.sendStockSaleMsg(mqData);
JSONObject baObj=new JSONObject();
baObj.put("userId",user.getUserId());
baObj.put("shopId",user.getShopId());
baObj.put("amount",orderInfo.getPayAmount());
baObj.put("balance",user.getAmount());
baObj.put("type","消费");
baObj.put("time",flow.getCreateTime());
producer.balance(baObj.toString());
return Result.success(CodeEnum.SUCCESS);
}
@@ -738,6 +749,17 @@ public class PayService {
mqData.put("type", "pc");
producer.sendStockSaleMsg(mqData);
JSONObject baObj=new JSONObject();
baObj.put("userId",user.getUserId());
baObj.put("shopId",user.getShopId());
baObj.put("amount",orderInfo.getPayAmount());
baObj.put("balance",user.getAmount());
baObj.put("type","消费");
baObj.put("time",flow.getCreateTime());
producer.balance(baObj.toString());
return Result.success(CodeEnum.SUCCESS);
}
@@ -912,6 +934,16 @@ public class PayService {
.eq(TbShopTable::getQrcode, orderInfo.getTableId())
.set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
JSONObject baObj=new JSONObject();
baObj.put("userId",shopUser.getUserId());
baObj.put("shopId",shopUser.getShopId());
baObj.put("amount",orderInfo.getPayAmount());
baObj.put("balance",shopUser.getAmount());
baObj.put("type","消费");
baObj.put("time",userFlow.getCreateTime());
producer.balance(baObj.toString());
return Result.success(CodeEnum.SUCCESS);
}
@@ -1205,6 +1237,16 @@ public class PayService {
flow.setCreateTime(new Date());
tbShopUserFlowMapper.insert(flow);
JSONObject baObj=new JSONObject();
baObj.put("userId",user.getUserId());
baObj.put("shopId",user.getShopId());
baObj.put("amount",newOrderInfo.getPayAmount());
baObj.put("balance",user.getAmount());
baObj.put("type","退款");
baObj.put("time",flow.getCreateTime());
producer.balance(baObj.toString());
}
}