diff --git a/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java
index 98daf88cd..aa50607a4 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java
@@ -126,18 +126,18 @@ public class OrderPayController {
         return orderPayService.ltPayOrder(ServletUtil.getClientIP(request), payParam);
     }
 
-    /**
-     * 正扫
-     */
-    @PostMapping("/scanPay")
-    @Debounce(value = "#payParam.checkOrderPay.orderId")
-    public CzgResult<Map<String, Object>> scanPayOrder(@RequestHeader Long shopId, HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) {
-        payParam.setShopId(shopId);
-        return orderPayService.scanPayOrder(ServletUtil.getClientIP(request), payParam);
-    }
+//    /**
+//     * 正扫
+//     */
+//    @PostMapping("/scanPay")
+//    @Debounce(value = "#payParam.checkOrderPay.orderId")
+//    public CzgResult<Map<String, Object>> scanPayOrder(@RequestHeader Long shopId, HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) {
+//        payParam.setShopId(shopId);
+//        return orderPayService.scanPayOrder(ServletUtil.getClientIP(request), payParam);
+//    }
 
     /**
-     * 反扫
+     * 扫码收款
      * authCode 必填 扫描码
      */
     @PostMapping("/microPay")
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java
index f8df987f4..2ba602fc4 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java
@@ -182,13 +182,14 @@ public class OrderInfo implements Serializable {
     /**
      * {@link com.czg.order.enums.PayEnums}
      * 支付类型
-     * 主扫 main_scan
-     * 被扫 back_scan
+     * 二维码收款 main_scan
+     * 扫码收款 back_scan
      * 微信小程序 wechat_mini
      * 支付宝小程序 alipay_mini
      * 会员支付 vip_pay
      * 现金支付 cash_pay
      * 挂账支付 credit_pay
+     * 霸王餐支付 free_pay
      */
     private String payType;
 
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
index 19fbcc6f5..a8c447996 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
@@ -169,22 +169,22 @@ public class ShopOrderStatistic implements Serializable {
     /**
      * 被扫收款金额
      */
-    @ExcelProperty("被扫收款金额")
+    @ExcelProperty("扫码收款金额")
     private BigDecimal backScanPayAmount;
     /**
      * 被扫收款笔数
      */
-    @ExcelProperty("被扫收款笔数")
+    @ExcelProperty("扫码收款笔数")
     private Long backScanPayCount;
     /**
-     * 主扫收款金额
+     * 二维码收款金额
      */
-    @ExcelProperty("主扫收款金额")
+    @ExcelProperty("二维码收款金额")
     private BigDecimal mainScanPayAmount;
     /**
-     * 主扫收款笔数
+     * 二维码收款笔数
      */
-    @ExcelProperty("主扫收款笔数")
+    @ExcelProperty("二维码收款笔数")
     private Long mainScanPayCount;
     /**
      * 挂账支付金额
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/enums/PayEnums.java b/cash-common/cash-common-service/src/main/java/com/czg/order/enums/PayEnums.java
index 094b34ed5..3fd829e92 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/enums/PayEnums.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/enums/PayEnums.java
@@ -17,11 +17,12 @@ public enum PayEnums {
     /**
      * 主扫
      */
-    MAIN_SCAN("main_scan", "主扫"),
+    MAIN_SCAN("main_scan", "二维码收款"),
     /**
      * 被扫
      */
-    BACK_SCAN("back_scan", "被扫"),
+//    BACK_SCAN("back_scan", "被扫"),
+    BACK_SCAN("back_scan", "扫码收款"),
     /**
      * 微信小程序
      */
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java
index 2025193b2..4c199636c 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java
@@ -290,7 +290,7 @@ public class OrderPayServiceImpl implements OrderPayService {
         }
         String payOrderNo = orderInfo.getPlatformType() + CzgRandomUtils.snowflake();
         Long paymentId = payService.initPayment(OrderPayment.orderPay(payParam.getShopId(), orderInfo.getId(), payOrderNo, orderInfo.getOrderAmount(), ""));
-        upOrderPayInfo(orderInfo.getId(), PayCst.Type.ALIPAY.equals(payParam.getPayType()) ? PayEnums.ALIPAY_MINI : PayEnums.WECHAT_MINI, paymentId,
+        upOrderPayInfo(orderInfo.getId(), PayEnums.MAIN_SCAN, paymentId,
                 payParam.getCheckOrderPay() == null ? null : payParam.getCheckOrderPay().getRemark());
         return payService.pay(payParam.getShopId(), CzgPayEnum.JS_PAY,
                 CzgPayBaseReq.jsPayReq(payOrderNo, "扫码支付", orderInfo.getOrderAmount().multiply(PayService.MONEY_RATE).longValue(),