From 1ad93c2d4ee88f996ee2f5e5e25a7da89e4b5a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Mon, 14 Oct 2024 16:12:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83payType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chaozhanggui/system/cashierservice/service/PayService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index d5892b5..da1d531 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -1094,7 +1094,6 @@ public class PayService { }else if("wechat".equalsIgnoreCase(payType)){ orderInfo.setPayType("wx_lite"); } - orderInfo.setPayType(payType); orderInfo.setPayOrderNo(payOrderNO); orderInfo.setPayAmount(orderInfo.getOrderAmount()); orderInfo.setPaidTime(System.currentTimeMillis()); From b9a2c3db5ce1c2f30809c143711ab26cdc78f02d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Mon, 14 Oct 2024 18:28:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrderController.java | 4 +-- .../cashierservice/service/CartService.java | 12 +++++--- .../cashierservice/service/PayService.java | 30 +++++++++---------- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java index b31672d..879da9a 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java @@ -2,7 +2,6 @@ package com.chaozhanggui.system.cashierservice.controller; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; -import com.chaozhanggui.system.cashierservice.annotation.LimitSubmit; import com.chaozhanggui.system.cashierservice.redis.RedisCst; import com.chaozhanggui.system.cashierservice.service.CartService; import com.chaozhanggui.system.cashierservice.service.OrderService; @@ -37,7 +36,8 @@ public class OrderController { * @return */ @PostMapping("/creatOrder") - public Result createOrder(@RequestBody JSONObject jsonObject){ + public Result createOrder(@RequestHeader String environment, @RequestBody JSONObject jsonObject){ + jsonObject.put("environment",environment); return Utils.runFunAndCheckKey(() -> cartService.createOrder(jsonObject), stringRedisTemplate, RedisCst.getLockKey("CREATE_ORDER_KEY")); // return orderService.createOrder(shopTable.getTableId(),shopTable.getShopId(),shopTable.getUserId()); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java index a10f5f1..f2a62b0 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -12,9 +12,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chaozhanggui.system.cashierservice.constant.TableConstant; import com.chaozhanggui.system.cashierservice.dao.*; +import com.chaozhanggui.system.cashierservice.entity.Enum.OrderUseTypeEnum; +import com.chaozhanggui.system.cashierservice.entity.Enum.PlatformTypeEnum; +import com.chaozhanggui.system.cashierservice.entity.Enum.ShopWxMsgTypeEnum; import com.chaozhanggui.system.cashierservice.entity.*; -import com.chaozhanggui.system.cashierservice.entity.Enum.*; -import com.chaozhanggui.system.cashierservice.entity.dto.ChoseCountDTO; import com.chaozhanggui.system.cashierservice.entity.dto.ChoseEatModelDTO; import com.chaozhanggui.system.cashierservice.entity.dto.ShopEatTypeInfoDTO; import com.chaozhanggui.system.cashierservice.exception.MsgException; @@ -1209,7 +1210,7 @@ public class CartService { private TbOrderInfo getOrder(BigDecimal totalAmount, BigDecimal packAMount, TbShopTable shopTable, String merchantId, JSONObject jsonObject, BigDecimal originAmount) { TbOrderInfo orderInfo = new TbOrderInfo(); - String orderNo = generateOrderNumber(); + String orderNo = generateOrderNumber(jsonObject.getString("environment")); orderInfo.setOrderNo(orderNo); orderInfo.setSettlementAmount(totalAmount); orderInfo.setPackFee(packAMount); @@ -1237,10 +1238,13 @@ public class CartService { return orderInfo; } - public String generateOrderNumber() { + public String generateOrderNumber(String environment) { String date = DateUtils.getSdfTimes(); Random random = new Random(); int randomNum = random.nextInt(900) + 100; + if ("alipay".equalsIgnoreCase(environment)) { + return "ALI" + date + randomNum; + } return "WX" + date + randomNum; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index da1d531..1d39fac 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -486,11 +486,11 @@ public class PayService { producer.putOrderCollect(jsonObject.toJSONString()); ShopEatTypeInfoDTO shopEatTypeInfoDTO = shopUtils.checkEatModel(orderInfo.getTableId(), orderInfo.getShopId()); + List detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper() + .eq(TbOrderDetail::getOrderId, orderInfo.getId()) + .eq(TbOrderDetail::getStatus, "closed")); // 打印消息 if (!shopEatTypeInfoDTO.isDineInAfter()) { - List detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper() - .eq(TbOrderDetail::getOrderId, orderInfo.getId()) - .eq(TbOrderDetail::getStatus, "closed")); mQUtils.printDishesTicket(orderInfo.getId(), false, detailList.toArray(new TbOrderDetail[0])); } mQUtils.printPlaceTicket(orderInfo.getId(), false); @@ -809,11 +809,11 @@ public class PayService { log.info("发送打印数据"); ShopEatTypeInfoDTO shopEatTypeInfoDTO = shopUtils.checkEatModel(orderInfo.getTableId(), orderInfo.getShopId()); + List detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper() + .eq(TbOrderDetail::getOrderId, orderInfo.getId()) + .eq(TbOrderDetail::getStatus, "closed")); // 打印消息 if (!shopEatTypeInfoDTO.isDineInAfter()) { - List detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper() - .eq(TbOrderDetail::getOrderId, orderInfo.getId()) - .eq(TbOrderDetail::getStatus, "closed")); mQUtils.printDishesTicket(orderInfo.getId(), false, detailList.toArray(new TbOrderDetail[0])); } mQUtils.printPlaceTicket(orderInfo.getId(), false); @@ -873,11 +873,11 @@ public class PayService { log.info("发送打印数据"); ShopEatTypeInfoDTO shopEatTypeInfoDTO = shopUtils.checkEatModel(orderInfo.getTableId(), orderInfo.getShopId()); + List detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper() + .eq(TbOrderDetail::getOrderId, orderInfo.getId()) + .eq(TbOrderDetail::getStatus, "closed")); // 打印消息 if (!shopEatTypeInfoDTO.isDineInAfter()) { - List detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper() - .eq(TbOrderDetail::getOrderId, orderInfo.getId()) - .eq(TbOrderDetail::getStatus, "closed")); mQUtils.printDishesTicket(orderInfo.getId(), false, detailList.toArray(new TbOrderDetail[0])); } mQUtils.printPlaceTicket(orderInfo.getId(), false); @@ -1032,11 +1032,11 @@ public class PayService { log.info("发送打印数据"); ShopEatTypeInfoDTO shopEatTypeInfoDTO = shopUtils.checkEatModel(orderInfo.getTableId(), orderInfo.getShopId()); + List detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper() + .eq(TbOrderDetail::getOrderId, orderInfo.getId()) + .eq(TbOrderDetail::getStatus, "closed")); // 打印消息 if (!shopEatTypeInfoDTO.isDineInAfter()) { - List detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper() - .eq(TbOrderDetail::getOrderId, orderInfo.getId()) - .eq(TbOrderDetail::getStatus, "closed")); mQUtils.printDishesTicket(orderInfo.getId(), false, detailList.toArray(new TbOrderDetail[0])); } mQUtils.printPlaceTicket(orderInfo.getId(), false); @@ -1109,11 +1109,11 @@ public class PayService { log.info("发送打印数据"); ShopEatTypeInfoDTO shopEatTypeInfoDTO = shopUtils.checkEatModel(orderInfo.getTableId(), orderInfo.getShopId()); + List detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper() + .eq(TbOrderDetail::getOrderId, orderInfo.getId()) + .eq(TbOrderDetail::getStatus, "closed")); // 打印消息 if (!shopEatTypeInfoDTO.isDineInAfter()) { - List detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper() - .eq(TbOrderDetail::getOrderId, orderInfo.getId()) - .eq(TbOrderDetail::getStatus, "closed")); mQUtils.printDishesTicket(orderInfo.getId(), false, detailList.toArray(new TbOrderDetail[0])); } mQUtils.printPlaceTicket(orderInfo.getId(), false); From 182c0d3eee534f5f499d381bfc6aa6545696af23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 15 Oct 2024 09:28:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/util/FeieyunPrintUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java index c0320eb..e125781 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java @@ -2,6 +2,7 @@ package com.chaozhanggui.system.cashierservice.util; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.chaozhanggui.system.cashierservice.model.OrderDetailPO; import org.apache.commons.codec.digest.DigestUtils; import org.apache.http.HttpEntity; @@ -19,7 +20,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Objects; public class FeieyunPrintUtil { @@ -125,11 +125,11 @@ public class FeieyunPrintUtil { builder.append("时间: "+date+"


"); if(productName.length()>4||remark.length()>4){ - builder.append(""+productName+" "+number+"

"); - builder.append(""+remark+"


"); + builder.append(""+productName+" x "+number+"

"); + builder.append(""+StrUtil.emptyToDefault(remark,"")+"


"); }else { - builder.append(""+productName+" "+number+"

"); - builder.append(""+remark+"


"); + builder.append(""+productName+" x "+number+"

"); + builder.append(""+StrUtil.emptyToDefault(remark,"")+"


"); } // builder.append(""); From 3303b9277aeb7667eca1d6dc81ced5f252449b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 15 Oct 2024 10:24:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/util/FeieyunPrintUtil.java | 6 +++--- .../system/cashierservice/util/PrinterUtils.java | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java index e125781..fd532be 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java @@ -123,13 +123,13 @@ public class FeieyunPrintUtil { builder.append(""+pickupNumber+"

"); builder.append("时间: "+date+"


"); - + remark = StrUtil.emptyToDefault(remark, ""); if(productName.length()>4||remark.length()>4){ builder.append(""+productName+" x "+number+"

"); - builder.append(""+StrUtil.emptyToDefault(remark,"")+"


"); + builder.append(""+remark+"


"); }else { builder.append(""+productName+" x "+number+"

"); - builder.append(""+StrUtil.emptyToDefault(remark,"")+"


"); + builder.append(""+remark+"


"); } // builder.append(""); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java index 7f438c6..25ae0f2 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java @@ -1,6 +1,7 @@ package com.chaozhanggui.system.cashierservice.util; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.chaozhanggui.system.cashierservice.model.OrderDetailPO; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpEntity; @@ -71,12 +72,12 @@ public class PrinterUtils { StringBuilder builder = new StringBuilder(); builder.append(""+pickupNumber+"

"); builder.append("时间: "+date+"


"); - + remark = StrUtil.emptyToDefault(remark, ""); if(productName.length()>4||remark.length()>4){ - builder.append(""+productName+" "+number+"
"); + builder.append(""+productName+" x "+number+"
"); builder.append(""+remark+"
"); }else { - builder.append(""+productName+" "+number+"
"); + builder.append(""+productName+" x "+number+"
"); builder.append(""+remark+"
"); } builder.append(""); @@ -105,12 +106,12 @@ public class PrinterUtils { builder.append("时间: " + date + "


"); - + remark = StrUtil.emptyToDefault(remark, ""); if (productName.length() > 4 || remark.length() > 4) { - builder.append("" + productName + " " + number + "
"); + builder.append("" + productName + " x " + number + "
"); builder.append("" + remark + "
"); } else { - builder.append("" + productName + " " + number + "
"); + builder.append("" + productName + " x " + number + "
"); builder.append("" + remark + "
"); } builder.append("");