diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index f764c12..7436064 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -13,10 +13,7 @@ import com.chaozhanggui.system.cashierservice.entity.po.QueryCartPo;
import com.chaozhanggui.system.cashierservice.entity.vo.CartVo;
import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
import com.chaozhanggui.system.cashierservice.sign.Result;
-import com.chaozhanggui.system.cashierservice.util.DateUtils;
-import com.chaozhanggui.system.cashierservice.util.HttpClientUtil;
-import com.chaozhanggui.system.cashierservice.util.RedisUtil;
-import com.chaozhanggui.system.cashierservice.util.RedisUtils;
+import com.chaozhanggui.system.cashierservice.util.*;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
@@ -385,7 +382,30 @@ public class OrderService {
if (Objects.nonNull(tbToken)){
orderInfo.setTokenId(tbToken.getId());
}
+
+
+
+
+ JSONObject object=new JSONObject();
+ String outNumber= redisUtil.getMessage(RedisCst.OUT_NUMBER.concat(orderInfo.getShopId()));
+ Integer number=1;
+ if(Objects.isNull(outNumber)){
+ object.put("outNumber",number);
+ object.put("times",DateUtils.getDay());
+ }else {
+ object=JSONObject.parseObject(outNumber);
+ if(object.getString("times").equals(DateUtils.getDay())){
+ number=object.getInteger("outNumber")+1;
+ object.put("outNumber",number);
+ }else {
+ object.put("outNumber",number);
+ object.put("times",DateUtils.getDay());
+ }
+ }
+ orderInfo.setOutNumber(number+"");
+
tbOrderInfoMapper.insert(orderInfo);
+ redisUtil.saveMessage(RedisCst.OUT_NUMBER.concat(orderInfo.getShopId()),object.toString());
orderId = orderInfo.getId();
}
for (TbOrderDetail orderDetail : orderDetails) {
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 bfebdf3..5797563 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
@@ -96,6 +96,10 @@ public class PrinterUtils {
sb.append(""+detailPO.getMerchantName()+"
");
sb.append(""+type+"【"+detailPO.getMasterId()+"】
");
+ if(Objects.nonNull(detailPO.getOutNumber())){
+ sb.append(""+detailPO.getOutNumber()+"
");
+ }
+
sb.append("订单号: "+detailPO.getOrderNo()+"
");
sb.append("交易时间: "+detailPO.getTradeDate()+"
");
sb.append("收银员: "+detailPO.getOperator()+"
");
@@ -103,7 +107,7 @@ public class PrinterUtils {
char paddingCharacter = ' ';
sb.append(""+String.format("%-15s","品名").replace(' ', paddingCharacter)+String.format("%-4s","数量").replace(' ', paddingCharacter)+String.format("%4s","小计").replace(' ', paddingCharacter)+"
");
for (OrderDetailPO.Detail detail : detailPO.getDetailList()) {
- if(detail.getProductName().length()>4){
+ if(detail.getProductName().length()>4&&detail.getProductName().length()<=10){
int count=getProducrName(detail.getProductName());
if(count<=0){
@@ -114,6 +118,11 @@ public class PrinterUtils {
sb.append(""+String.format("%-"+length+"s",detail.getProductName()).replace(' ', paddingCharacter)+String.format("%-4s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%8s",detail.getAmount()).replace(' ', paddingCharacter)+"
");
}
+ }else if(detail.getProductName().length()>10){
+
+ sb.append(""+detail.getProductName()+"
");
+ sb.append(""+String.format("%20s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%11s",detail.getAmount()).replace(' ', paddingCharacter)+"
");
+
}else {
sb.append(""+String.format("%-15s",detail.getProductName()).replace(' ', paddingCharacter)+String.format("%-4s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%8s",detail.getAmount()).replace(' ', paddingCharacter)+"
");
}
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/RedisCst.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/RedisCst.java
index e432f12..36c2984 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/RedisCst.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/RedisCst.java
@@ -14,4 +14,6 @@ public class RedisCst {
public static final String CART = "CZG:CART:";
public static final Object PRODUCT = "PRODUCT:";
+
+ public static final String OUT_NUMBER="ORDER:NUMBER:";
}
diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml
index 344708d..ea2b045 100644
--- a/src/main/resources/mapper/TbOrderInfoMapper.xml
+++ b/src/main/resources/mapper/TbOrderInfoMapper.xml
@@ -109,7 +109,7 @@
deduct_score, user_coupon_id, user_coupon_amount,
refund_able, paid_time, is_effect,
is_group, updated_at, system_time,
- created_at, is_accepted, pay_order_no,trade_day,source,remark,master_id,table_name
+ created_at, is_accepted, pay_order_no,trade_day,source,remark,master_id,table_name,out_number
)
values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{settlementAmount,jdbcType=DECIMAL},
#{packFee,jdbcType=DECIMAL}, #{originAmount,jdbcType=DECIMAL}, #{productAmount,jdbcType=DECIMAL},
@@ -124,7 +124,8 @@
#{refundAble,jdbcType=TINYINT}, #{paidTime,jdbcType=BIGINT}, #{isEffect,jdbcType=TINYINT},
#{isGroup,jdbcType=TINYINT}, #{updatedAt,jdbcType=BIGINT}, #{systemTime,jdbcType=BIGINT},
#{createdAt,jdbcType=BIGINT}, #{isAccepted,jdbcType=TINYINT}, #{payOrderNo,jdbcType=VARCHAR},
- #{tradeDay,jdbcType=VARCHAR}, #{source,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{masterId,jdbcType=VARCHAR},#{tableName,jdbcType=VARCHAR}
+ #{tradeDay,jdbcType=VARCHAR}, #{source,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{masterId,jdbcType=VARCHAR},#{tableName,jdbcType=VARCHAR},
+ #{outNumber,jdbcType=VARCHAR}
)