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

Merge branch 'refs/heads/dev' into test

Browse Source 
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
This commit is contained in:
SongZhang
2024-10-29 13:55:03 +08:00
parent 1782605c12 8010ee3ffe
commit 7184160296
5 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -967,6 +967,9 @@ public class CartService {
orderInfo.setFreightAmount(BigDecimal.ZERO);
orderInfo.setProductAmount(saleAmount);
orderInfo.setRemark(remark);
if (StrUtil.isNotBlank(remark)) {
orderInfo.setRemark(remark);
}
orderInfo.setUserId(userId);
if (hasNewInfo) {
orderInfo.setPlaceNum(currentPlaceNum);
@@ -982,7 +985,9 @@ public class CartService {
orderInfo.setUserCouponId(couponId);
orderInfo.setOriginAmount(originAmount);
orderInfo.setUserCouponAmount(couponAmount);
orderInfo.setRemark(remark);
if (StrUtil.isNotBlank(remark)) {
orderInfo.setRemark(remark);
}
orderInfo.setUserId(userId);
orderInfo.setPlaceNum(currentPlaceNum);
orderInfo.setUseType(shopEatTypeInfoDTO.getUseType());
@@ -1041,7 +1046,6 @@ public class CartService {
// cashierCartMapper.deleteByPrimaryKey(seatCartInfo.getId());
// }
// 打印票据
if (!addOrderDetail.isEmpty() && shopEatTypeInfoDTO.isDineInAfter()) {
log.info("待打印菜品信息: {}", addOrderDetail);

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

@@ -256,8 +256,8 @@ public class OrderService {
return Result.fail("订单不存在");
}
TbShopInfo tbShopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
if (tbShopInfo == null) {
TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
if (shopInfo == null) {
return Result.fail("店铺不存在");
}
@@ -296,10 +296,10 @@ public class OrderService {
TbShopTable tbShopTable = shopTableMapper.selectQRcode(orderInfo.getTableId());
OrderVo orderVo = new OrderVo();
orderVo.setName(tbShopInfo.getShopName());
orderVo.setName(shopInfo.getShopName());
orderVo.setStatus(orderInfo.getStatus());
//TODO 增加商家二维码
orderVo.setShopQrcode(tbShopInfo.getShopQrcode());
orderVo.setShopQrcode(shopInfo.getShopQrcode());
orderVo.setDetails(list);
orderVo.setOrderNo(orderInfo.getOrderNo());
orderVo.setTime(orderInfo.getCreatedAt());
@@ -318,8 +318,7 @@ public class OrderService {
orderVo.setOutNumber(orderInfo.getOutNumber());
orderVo.setUseType(orderInfo.getUseType());
orderVo.setShopId(Integer.valueOf(orderInfo.getShopId()));
TbShopInfo shopInfo = mpShopInfoMapper.selectById(orderInfo.getShopId());
orderVo.setQrcode(shopInfo == null ? null : shopInfo.getShopQrcode());
orderVo.setQrcode(shopInfo.getShopQrcode());
Map<String, Object> map = new HashMap<>();
// 餐位费
map.put("seatFee", mealCashierCart);
@@ -328,6 +327,7 @@ public class OrderService {
map.putAll(BeanUtil.beanToMap(orderVo, false, false));
map.put("createdAt", DateUtil.formatDateTime(DateUtil.date(orderInfo.getCreatedAt())));
map.put("paidTime", orderInfo.getPaidTime() == null ? null : DateUtil.formatDateTime(DateUtil.date(orderInfo.getPaidTime())));
map.put("registerType", shopInfo.getRegisterType());
return map;
}
}