1.创建订单同步保存用户id

2.代客下单订单不重复出票
3.订单支付完毕清楚当前台桌缓存订单号

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java

@@ -103,6 +103,8 @@ public class TbOrderInfo implements Serializable {
     private String isWinner;
     private String shopName;
 
+    private String useType;
+
 
     //根据状态返回 需付款 已付款 未付款 已退
     private String description;
@@ -188,4 +190,4 @@ public class TbOrderInfo implements Serializable {
         this.createdAt = System.currentTimeMillis();
         this.isAccepted = 1;
     }
-}
+}

src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java

@@ -1,6 +1,8 @@
 package com.chaozhanggui.system.cashierservice.rabbit;
 
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.chaozhanggui.system.cashierservice.dao.*;
 import com.chaozhanggui.system.cashierservice.entity.*;
@@ -18,6 +20,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -74,6 +77,9 @@ public class PrintMechineConsumer {
                 return;
             }
 
+            log.info("打印机列表，{}", ArrayUtil.toString(list));
+            log.info("待打印订单信息, {}", orderInfo);
+
             list.parallelStream().forEach(tbPrintMachineWithBLOBs->{
                 if (!"network".equals(tbPrintMachineWithBLOBs.getConnectionType())) {
                     log.error("非网络打印机:{},{}",tbPrintMachineWithBLOBs.getAddress(),tbPrintMachineWithBLOBs.getConnectionType());
@@ -184,6 +190,10 @@ public class PrintMechineConsumer {
                         cashierCarts = tbCashierCartMapper.selectByOrderId(orderId,"final");
                         if (ObjectUtil.isNotEmpty(cashierCarts) && cashierCarts.size() > 0) {
 
+                            // 取餐号不为空为代客下单
+                            if ("postPay".equals(orderInfo.getUseType())) {
+                                return;
+                            }
                             cashierCarts.parallelStream().forEach(it -> {
 
                                 String categoryId;

src/main/java/com/chaozhanggui/system/cashierservice/redis/RedisCst.java

@@ -26,4 +26,11 @@ public class RedisCst {
     public static final String CREATE_ORDER_LOCK = "CREATE_ORDER_LOCK:";
     public static final String SEND_STOCK_WARN_MSG = "SEND_STOCK_WARN_MSG:";
     public static final String SONG_PAY_LOCK = "song_pay_lock:";
+
+    static String CURRENT_TABLE_ORDER = "CURRENT_TABLE_ORDER:";
+
+
+    public static String getCurrentOrderKey(String tableId, String shopId) {
+     return CURRENT_TABLE_ORDER + shopId + ":" + tableId;
+    }
 }

src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java

@@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -93,6 +94,8 @@ public class CartService {
 
     private final RedisTemplate<String, Object> redisTemplate;
 
+    private final StringRedisTemplate stringRedisTemplate;
+
 
     @Autowired
     private TbProskuConMapper tbProskuConMapper;
@@ -100,7 +103,7 @@ public class CartService {
     @Autowired
     TbConsInfoMapper tbConsInfoMapper;
 
-    public CartService(TbUserShopMsgMapper tbUserShopMsgMapper, WechatUtil wechatUtil, WxAccountUtil wxAccountUtil, TbShopOpenIdMapper shopOpenIdMapper, ProductService productService, TbProductMapper tbProductMapper, RedisTemplate<String, Object> redisTemplate) {
+    public CartService(TbUserShopMsgMapper tbUserShopMsgMapper, WechatUtil wechatUtil, WxAccountUtil wxAccountUtil, TbShopOpenIdMapper shopOpenIdMapper, ProductService productService, TbProductMapper tbProductMapper, RedisTemplate<String, Object> redisTemplate, StringRedisTemplate stringRedisTemplate) {
         this.tbUserShopMsgMapper = tbUserShopMsgMapper;
         this.wechatUtil = wechatUtil;
         this.wxAccountUtil = wxAccountUtil;
@@ -108,6 +111,7 @@ public class CartService {
         this.productService = productService;
         this.tbProductMapper = tbProductMapper;
         this.redisTemplate = redisTemplate;
+        this.stringRedisTemplate = stringRedisTemplate;
     }
 
     public void initCart(JSONObject jsonObject) {
@@ -708,6 +712,7 @@ public class CartService {
                 orderInfo.setIsBuyCoupon(isBuyYhq);
                 orderInfo.setIsUseCoupon(isuseYhq);
                 orderInfo.setRemark(remark);
+                orderInfo.setUserId(userId);
                 orderInfoMapper.updateByPrimaryKeySelective(orderInfo);
 
             } else {
@@ -719,6 +724,7 @@ public class CartService {
                 orderInfo.setIsUseCoupon(isuseYhq);
                 orderInfo.setUserCouponAmount(couponAmount);
                 orderInfo.setRemark(remark);
+                orderInfo.setUserId(userId);
 
                 JSONObject object = new JSONObject();
                 String outNumber = redisUtil.getMessage(RedisCst.OUT_NUMBER.concat(jsonObject.getString("shopId")));

src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java

@@ -31,6 +31,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -158,6 +159,8 @@ public class PayService {
     private final TbShopSongOrderService shopSongOrderService;
     @Autowired
     private MQUtils mQUtils;
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
 
     public PayService(@Qualifier("tbShopSongOrderServiceImpl") TbShopSongOrderService shopSongOrderService) {
         this.shopSongOrderService = shopSongOrderService;
@@ -330,6 +333,7 @@ public class PayService {
         if (ObjectUtil.isEmpty(orderInfo)) {
             return Result.fail("订单信息不存在");
         }
+
         if (System.currentTimeMillis() - orderInfo.getCreatedAt() > 60 * 15 * 1000) {
             return Result.fail("订单十五分钟内有效,当前已超时,请重新下单。");
         }
@@ -432,10 +436,12 @@ public class PayService {
         baObj.put("time",flow.getCreateTime());
         producer.balance(baObj.toString());
 
-
+        // 为代客下单清楚当前台桌最新订单
-
+        String currentOrderKey = RedisCst.getCurrentOrderKey(orderInfo.getTableId(), orderInfo.getShopId());
-
+        String currentOrderId = stringRedisTemplate.opsForValue().get(currentOrderKey);
-
+        if (currentOrderId != null && currentOrderId.equals(orderId)) {
+            stringRedisTemplate.delete(currentOrderKey);
+        }
 
         return Result.success(CodeEnum.SUCCESS, "1");
     }
@@ -916,6 +922,13 @@ public class PayService {
             sendOrderToClient(orderInfo);
             redisUtil.deleteByKey(RedisCst.ORDER_EXPIRED.concat(orderInfo.getId().toString()));
 
+            // 为代客下单清除当前台桌最新订单
+            String currentOrderKey = RedisCst.getCurrentOrderKey(orderInfo.getTableId(), orderInfo.getShopId());
+            String currentOrderId = stringRedisTemplate.opsForValue().get(currentOrderKey);
+            if (currentOrderId != null && currentOrderId.equals(orderInfo.getId().toString())) {
+                stringRedisTemplate.delete(currentOrderKey);
+            }
+
             // 发送mq消息并保存库存记录
             JSONObject data = new JSONObject();
             data.put("orderId", orderInfo.getId());
@@ -967,6 +980,13 @@ public class PayService {
             sendOrderToClient(orderInfo);
             redisUtil.deleteByKey(RedisCst.ORDER_EXPIRED.concat(orderInfo.getId().toString()));
 
+            // 为代客下单清楚当前台桌最新订单
+            String currentOrderKey = RedisCst.getCurrentOrderKey(orderInfo.getTableId(), orderInfo.getShopId());
+            String currentOrderId = stringRedisTemplate.opsForValue().get(currentOrderKey);
+            if (currentOrderId != null && currentOrderId.equals(orderInfo.getId().toString())) {
+                stringRedisTemplate.delete(currentOrderKey);
+            }
+
             // 发送mq消息并保存库存记录
             JSONObject data = new JSONObject();
             data.put("orderId", orderInfo.getId());

src/main/resources/mapper/TbOrderInfoMapper.xml

@@ -51,17 +51,17 @@
         <result column="out_number" jdbcType="VARCHAR" property="outNumber"/>
     </resultMap>
     <sql id="Base_Column_List">
-    id, order_no, settlement_amount, pack_fee, origin_amount, product_amount, amount, 
+    id, order_no, settlement_amount, pack_fee, origin_amount, product_amount, amount,
-    refund_amount, pay_type, pay_amount, order_amount, freight_amount, discount_ratio, 
+    refund_amount, pay_type, pay_amount, order_amount, freight_amount, discount_ratio,
-    discount_amount, table_id, small_change, send_type, order_type, product_type, status, 
+    discount_amount, table_id, small_change, send_type, order_type, product_type, status,
-    billing_id, merchant_id, shop_id, is_vip, member_id, user_id, product_score, deduct_score, 
+    billing_id, merchant_id, shop_id, is_vip, member_id, user_id, product_score, deduct_score,
-    user_coupon_id, user_coupon_amount, refund_able, paid_time, is_effect, is_group, 
+    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`,is_buy_coupon,is_use_coupon,out_number
   </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List"/>
+        *
         from tb_order_info
         where id = #{id,jdbcType=INTEGER}
     </select>
@@ -72,32 +72,32 @@
 
     <insert id="insert" parameterType="com.chaozhanggui.system.cashierservice.entity.TbOrderInfo"
             useGeneratedKeys="true" keyProperty="id">
-    insert into tb_order_info (id, order_no, settlement_amount, 
+    insert into tb_order_info (id, order_no, settlement_amount,
-      pack_fee, origin_amount, product_amount, 
+      pack_fee, origin_amount, product_amount,
-      amount, refund_amount, pay_type, 
+      amount, refund_amount, pay_type,
-      pay_amount, order_amount, freight_amount, 
+      pay_amount, order_amount, freight_amount,
-      discount_ratio, discount_amount, table_id, 
+      discount_ratio, discount_amount, table_id,
-      small_change, send_type, order_type, 
+      small_change, send_type, order_type,
-      product_type, status, billing_id, 
+      product_type, status, billing_id,
-      merchant_id, shop_id, is_vip, 
+      merchant_id, shop_id, is_vip,
-      member_id, user_id, product_score, 
+      member_id, user_id, product_score,
-      deduct_score, user_coupon_id, user_coupon_amount, 
+      deduct_score, user_coupon_id, user_coupon_amount,
-      refund_able, paid_time, is_effect, 
+      refund_able, paid_time, is_effect,
-      is_group, updated_at, system_time, 
+      is_group, updated_at, system_time,
       created_at, is_accepted, pay_order_no,trade_day,source,remark,master_id,table_name,is_buy_coupon,is_use_coupon,out_number
       )
-    values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{settlementAmount,jdbcType=DECIMAL}, 
+    values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{settlementAmount,jdbcType=DECIMAL},
-      #{packFee,jdbcType=DECIMAL}, #{originAmount,jdbcType=DECIMAL}, #{productAmount,jdbcType=DECIMAL}, 
+      #{packFee,jdbcType=DECIMAL}, #{originAmount,jdbcType=DECIMAL}, #{productAmount,jdbcType=DECIMAL},
-      #{amount,jdbcType=DECIMAL}, #{refundAmount,jdbcType=DECIMAL}, #{payType,jdbcType=VARCHAR}, 
+      #{amount,jdbcType=DECIMAL}, #{refundAmount,jdbcType=DECIMAL}, #{payType,jdbcType=VARCHAR},
-      #{payAmount,jdbcType=DECIMAL}, #{orderAmount,jdbcType=DECIMAL}, #{freightAmount,jdbcType=DECIMAL}, 
+      #{payAmount,jdbcType=DECIMAL}, #{orderAmount,jdbcType=DECIMAL}, #{freightAmount,jdbcType=DECIMAL},
-      #{discountRatio,jdbcType=DECIMAL}, #{discountAmount,jdbcType=DECIMAL}, #{tableId,jdbcType=VARCHAR}, 
+      #{discountRatio,jdbcType=DECIMAL}, #{discountAmount,jdbcType=DECIMAL}, #{tableId,jdbcType=VARCHAR},
-      #{smallChange,jdbcType=DECIMAL}, #{sendType,jdbcType=VARCHAR}, #{orderType,jdbcType=VARCHAR}, 
+      #{smallChange,jdbcType=DECIMAL}, #{sendType,jdbcType=VARCHAR}, #{orderType,jdbcType=VARCHAR},
-      #{productType,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{billingId,jdbcType=VARCHAR}, 
+      #{productType,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{billingId,jdbcType=VARCHAR},
-      #{merchantId,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, #{isVip,jdbcType=TINYINT}, 
+      #{merchantId,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, #{isVip,jdbcType=TINYINT},
-      #{memberId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{productScore,jdbcType=INTEGER}, 
+      #{memberId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{productScore,jdbcType=INTEGER},
-      #{deductScore,jdbcType=INTEGER}, #{userCouponId,jdbcType=VARCHAR}, #{userCouponAmount,jdbcType=DECIMAL}, 
+      #{deductScore,jdbcType=INTEGER}, #{userCouponId,jdbcType=VARCHAR}, #{userCouponAmount,jdbcType=DECIMAL},
-      #{refundAble,jdbcType=TINYINT}, #{paidTime,jdbcType=BIGINT}, #{isEffect,jdbcType=TINYINT}, 
+      #{refundAble,jdbcType=TINYINT}, #{paidTime,jdbcType=BIGINT}, #{isEffect,jdbcType=TINYINT},
-      #{isGroup,jdbcType=TINYINT}, #{updatedAt,jdbcType=BIGINT}, #{systemTime,jdbcType=BIGINT}, 
+      #{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}, #{isBuyCoupon,jdbcType=VARCHAR}, #{isUseCoupon,jdbcType=VARCHAR},#{outNumber,jdbcType=VARCHAR}
@@ -486,9 +486,10 @@
             <if test="isBuyCoupon != null">
                 is_buy_coupon = #{isBuyCoupon,jdbcType=VARCHAR},
             </if>
-            <if test="isUseCoupon != null">
+            <if test="userId != null">
-                is_use_coupon = #{isUseCoupon,jdbcType=VARCHAR},
+                user_id = #{userId,jdbcType=VARCHAR},
             </if>
+
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
@@ -576,4 +577,4 @@
                                                                                                 left join tb_user_info tui on tui.id = toi.user_id
         where toi.user_id = #{userId}
     </select>
-</mapper>
+</mapper>