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 d5892b5..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<TbOrderDetail> detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()
+                .eq(TbOrderDetail::getOrderId, orderInfo.getId())
+                .eq(TbOrderDetail::getStatus, "closed"));
         // 打印消息
         if (!shopEatTypeInfoDTO.isDineInAfter()) {
-            List<TbOrderDetail> detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()
-                    .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<TbOrderDetail> detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()
+                                            .eq(TbOrderDetail::getOrderId, orderInfo.getId())
+                                            .eq(TbOrderDetail::getStatus, "closed"));
                                     // 打印消息
                                     if (!shopEatTypeInfoDTO.isDineInAfter()) {
-                                        List<TbOrderDetail> detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()
-                                                .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<TbOrderDetail> detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()
+                                            .eq(TbOrderDetail::getOrderId, orderInfo.getId())
+                                            .eq(TbOrderDetail::getStatus, "closed"));
                                     // 打印消息
                                     if (!shopEatTypeInfoDTO.isDineInAfter()) {
-                                        List<TbOrderDetail> detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()
-                                                .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<TbOrderDetail> detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()
+                    .eq(TbOrderDetail::getOrderId, orderInfo.getId())
+                    .eq(TbOrderDetail::getStatus, "closed"));
             // 打印消息
             if (!shopEatTypeInfoDTO.isDineInAfter()) {
-                List<TbOrderDetail> detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()
-                        .eq(TbOrderDetail::getOrderId, orderInfo.getId())
-                        .eq(TbOrderDetail::getStatus, "closed"));
                 mQUtils.printDishesTicket(orderInfo.getId(), false, detailList.toArray(new TbOrderDetail[0]));
             }
             mQUtils.printPlaceTicket(orderInfo.getId(), false);
@@ -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());
@@ -1110,11 +1109,11 @@ public class PayService {
 
             log.info("发送打印数据");
             ShopEatTypeInfoDTO shopEatTypeInfoDTO = shopUtils.checkEatModel(orderInfo.getTableId(), orderInfo.getShopId());
+            List<TbOrderDetail> detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()
+                    .eq(TbOrderDetail::getOrderId, orderInfo.getId())
+                    .eq(TbOrderDetail::getStatus, "closed"));
             // 打印消息
             if (!shopEatTypeInfoDTO.isDineInAfter()) {
-                List<TbOrderDetail> detailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()
-                        .eq(TbOrderDetail::getOrderId, orderInfo.getId())
-                        .eq(TbOrderDetail::getStatus, "closed"));
                 mQUtils.printDishesTicket(orderInfo.getId(), false, detailList.toArray(new TbOrderDetail[0]));
             }
             mQUtils.printPlaceTicket(orderInfo.getId(), false);
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..fd532be 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 {
 
@@ -123,12 +123,12 @@ public class FeieyunPrintUtil {
 
         builder.append("<CB>"+pickupNumber+"</CB><BR><BR>");
         builder.append("<L>时间: "+date+" </L><BR><BR><BR>");
-
+        remark = StrUtil.emptyToDefault(remark, "");
         if(productName.length()>4||remark.length()>4){
-            builder.append("<B><BOLD>"+productName+"      "+number+"</BOLD></B><BR><BR>");
+            builder.append("<B><BOLD>"+productName+"      x "+number+"</BOLD></B><BR><BR>");
             builder.append("<B><BOLD>"+remark+" </BOLD></B><BR><BR><BR>");
         }else {
-            builder.append("<B><BOLD>"+productName+"      "+number+"</BOLD></B><BR><BR>");
+            builder.append("<B><BOLD>"+productName+"      x "+number+"</BOLD></B><BR><BR>");
             builder.append("<B><BOLD>"+remark+" </BOLD></B><BR><BR><BR>");
         }
 
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("<C><B>"+pickupNumber+"</B></C><BR><BR>");
         builder.append("<S><L>时间: "+date+" </L></S><BR><BR><BR>");
-
+        remark = StrUtil.emptyToDefault(remark, "");
         if(productName.length()>4||remark.length()>4){
-            builder.append("<CS:32>"+productName+"  "+number+"</CS><BR>");
+            builder.append("<CS:32>"+productName+"  x "+number+"</CS><BR>");
             builder.append("<CS:32>"+remark+" </CS><BR>");
         }else {
-            builder.append("<B>"+productName+"  "+number+"</B><BR>");
+            builder.append("<B>"+productName+"  x "+number+"</B><BR>");
             builder.append("<B>"+remark+" </B><BR>");
         }
         builder.append("<OUT:150>");
@@ -105,12 +106,12 @@ public class PrinterUtils {
 
 
         builder.append("<S><L>时间: " + date + " </L></S><BR><BR><BR>");
-
+        remark = StrUtil.emptyToDefault(remark, "");
         if (productName.length() > 4 || remark.length() > 4) {
-            builder.append("<CS:32>" + productName + "  " + number + "</CS><BR>");
+            builder.append("<CS:32>" + productName + "  x " + number + "</CS><BR>");
             builder.append("<CS:32>" + remark + " </CS><BR>");
         } else {
-            builder.append("<B>" + productName + "  " + number + "</B><BR>");
+            builder.append("<B>" + productName + "  x " + number + "</B><BR>");
             builder.append("<B>" + remark + " </B><BR>");
         }
         builder.append("<OUT:150>");