订单总额

cash-common/cash-common-service/src/main/java/com/czg/account/dto/HandoverRecordDTO.java

@@ -58,6 +58,10 @@ public class HandoverRecordDTO implements Serializable {
      * 营业额
      */
     private BigDecimal turnover;
+    /**
+     * 订单额
+     */
+    private BigDecimal orderTurnover;
 
     /**
      * 现金收款 cash_pay

cash-common/cash-common-service/src/main/java/com/czg/account/entity/HandoverRecord.java

@@ -58,6 +58,10 @@ public class HandoverRecord implements Serializable {
      * 营业额
      */
     private BigDecimal turnover;
+    /**
+     * 订单额
+     */
+    private BigDecimal orderTurnover;
 
     /**
      * 现金收款 cash_pay

cash-common/cash-common-service/src/main/java/com/czg/account/vo/HandoverTotalVo.java

@@ -58,6 +58,10 @@ public class HandoverTotalVo implements Serializable {
      * 营业额
      */
     private BigDecimal turnover;
+    /**
+     * 订单额
+     */
+    private BigDecimal orderTurnover;
 
     /**
      * 现金收款 cash_pay

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java

@@ -93,6 +93,7 @@ public class HandoverRecordServiceImpl extends ServiceImpl<HandoverRecordMapper,
         CopyOptions copyOptions = CopyOptions.create().setIgnoreNullValue(true);
         if (onlinePayTypeDate != null) {
             BeanUtil.copyProperties(onlinePayTypeDate, data, copyOptions);
+            data.setTurnover(onlinePayTypeDate.getOrderTurnover());
         }
         HandoverRecord handoverRecord = orderInfoRpcService.countShopUserFlow(shopId, loginTimeStr, handoverTimeStr);
         if(handoverRecord != null){

cash-service/market-service/src/main/java/com/czg/service/market/mapper/OrderInfoMapper.java

@@ -48,7 +48,7 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
      * 订单支付方式统计 当日实时数据
      */
     @Select("SELECT" +
-            " SUM(tb_order_info.pay_amount) AS turnover," +
+            " SUM(tb_order_info.pay_amount) AS orderTurnover," +
             " SUM(CASE WHEN pay_type = 'main_scan' THEN pay_amount ELSE 0 END) AS selfScan," +
             " SUM(CASE WHEN pay_type = 'back_scan' THEN pay_amount ELSE 0 END) AS barScan," +
             " SUM(CASE WHEN pay_type = 'wechat_mini' THEN pay_amount ELSE 0 END) AS wechat," +

cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java

@@ -205,7 +205,7 @@ public interface PrinterImpl {
                 .append(getFormatLabel(leftRightAlign(" 退款金额:", handoverRecord.getRefundAmount().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br)
                 .append(getFormatLabel(leftRightAlign(" 退菜数量:", handoverRecord.getReturnDishCount().toString(), 32), signLabelInfo.s)).append(signLabelInfo.br)
                 .append(getFormatLabel("--------------------------------", signLabelInfo.s)).append(signLabelInfo.br)
-                .append(getFormatLabel(leftRightAlign("订单（数量/订单总额）", handoverRecord.getOrderCount() + "/" + handoverRecord.getTurnover(), 32), signLabelInfo.s)).append(signLabelInfo.br)
+                .append(getFormatLabel(leftRightAlign("订单数量/订单总额", handoverRecord.getOrderCount() + "/" + handoverRecord.getOrderTurnover(), 32), signLabelInfo.s)).append(signLabelInfo.br)
                 .append(getFormatLabel("----------- 销售数据 -----------", signLabelInfo.s)).append(signLabelInfo.br)
                 .append(getFormatLabel(formatItemLine("商品分类", "数量", "总计", 14, 8), signLabelInfo.s))
                 .append(signLabelInfo.br);