From 0a462507fa4d7d5ca3b2950c82b5c6b8502b0106 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 22 Mar 2021 20:17:51 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java |    8 ++++----
 zq-erp/src/main/resources/config/prd/application.properties                             |    2 +-
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html        |    8 ++++----
 zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml                    |    8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
index 1e81817..9a8f42b 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
@@ -301,7 +301,7 @@
     @Override
     public VerifyResult checkArrears(SysProjServices sysProjServices) {
         // 检测欠款
-       for (SysBeauticianState sysBeauticianState : sysProjServices.getServiceItems()) {
+       /*for (SysBeauticianState sysBeauticianState : sysProjServices.getServiceItems()) {
             SysProjUse sysProjUse = projUseService.findById(sysBeauticianState.getPuseId());
 
             ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(sysProjUse.getProjId());
@@ -328,11 +328,11 @@
 
                 }
             } else if ("赠送".equals(sysProjUse.getSource())) {
-                if (orderItem!=null &&orderItem.getArrears() > 0) {
-                    return new VerifyResult(true, shoppingGoods.getName() + "存在欠款" + orderItem.getArrears() + "元 , 不能消费赠送项目,订单编号[ " + orderItem.getOrderNo() + " ] ");
+                if (orderItem!=null && orderItem.getArrears()!=null&&orderItem.getArrears() > 0) {
+                    return new VerifyResult(true, shoppingGoods.getName() + "存在欠款" + orderItem.getArrears() + "元 , 不能消费赠送项目,订单编号[ " + sysOrderService.findById(orderItem.getOrderId()).getOrderNo() + " ] ");
                 }
             }
-        }
+        }*/
         return new VerifyResult(false);
     }
 
diff --git a/zq-erp/src/main/resources/config/prd/application.properties b/zq-erp/src/main/resources/config/prd/application.properties
index 98c2bfe..6f0eb87 100644
--- a/zq-erp/src/main/resources/config/prd/application.properties
+++ b/zq-erp/src/main/resources/config/prd/application.properties
@@ -42,7 +42,7 @@
 
 
 #rabbitMQ配置
-rabbitmq.host=127.0.0.1
+rabbitmq.host=47.111.134.136
 rabbitmq.port=5672
 rabbitmq.username=hivequeue
 rabbitmq.password=hivequeueadmin
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
index c412857..8100408 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml
@@ -681,7 +681,7 @@
                 (select IFNULL(sum(zk_price*count),0) from sys_order_item a
                     inner join shopping_goods b on a.goods_id=b.id
                     inner join sys_order c on a.ORDER_ID=c.id
-                    where b.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
+                    where b.good_type='家居产品' and <![CDATA[ c.pay_time > #{item.beginTime} and c.pay_time < #{item.endTime}]]>
                     <if test="shopId != null">
                         and c.shop_id=#{shopId}
                     </if>
@@ -692,7 +692,7 @@
                 (select IFNULL(sum(zk_price*count),0) from sys_order_item a
                     inner join shopping_goods b on a.goods_id=b.id
                     inner join sys_order c on a.ORDER_ID=c.id
-                    where b.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
+                    where b.good_type!='家居产品' and <![CDATA[ c.pay_time > #{item.beginTime} and c.pay_time < #{item.endTime}]]>
                     <if test="shopId != null">
                         and c.shop_id=#{shopId}
                     </if>
@@ -850,7 +850,7 @@
             (select IFNULL(sum(zk_price*count),0) from sys_order_item a
             inner join shopping_goods b on a.goods_id=b.id
             inner join sys_order c on a.ORDER_ID=c.id
-            where b.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
+            where b.good_type='家居产品' and <![CDATA[ c.pay_time > #{item.beginTime} and c.pay_time < #{item.endTime}]]>
             <if test="shopId != null">
                 and c.shop_id=#{shopId}
             </if>
@@ -858,7 +858,7 @@
             (select IFNULL(sum(zk_price*count),0) from sys_order_item a
             inner join shopping_goods b on a.goods_id=b.id
             inner join sys_order c on a.ORDER_ID=c.id
-            where b.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]>
+            where b.good_type!='家居产品' and <![CDATA[ c.pay_time > #{item.beginTime} and c.pay_time < #{item.endTime}]]>
             <if test="shopId != null">
                 and c.shop_id=#{shopId}
             </if>
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index f6d935e..63aaa8b 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -306,7 +306,7 @@
                     <el-table-column
                             label="小计">
                         <template slot-scope="scope">
-                            {{scope.row.zkPrice * scope.row.count }}
+                            {{(scope.row.zkPrice * scope.row.count).toFixed(2) }}
                         </template>
                     </el-table-column>
 
@@ -370,7 +370,7 @@
 
                             <li>订单总金额:{{order.total}}</li>
 
-                            <li>整单折扣:<span class="arrears" v-if="order.zkTotal != null">{{order.total - order.zkTotal}}</span></li>
+                            <li>整单折扣:<span class="arrears" v-if="order.zkTotal != null">{{(order.total - order.zkTotal).toFixed(2)}}</span></li>
 <!--                            <li v-if="order.arrears>0">订单欠款:<span class="arrears">{{order.arrears}}</span></li>-->
 <!--                            <li v-if="order.arrears<0">找零:<span class="arrears">{{order.arrears}}</span></li>-->
                         </ul>
@@ -916,8 +916,8 @@
                         callback: function (data) {
                             let order = data.rows[0];
                             console.log("order", order);
-                            _this.order.zkTotal = order.zkTotal;
-                            _this.order.total = order.total;
+                            _this.order.zkTotal = order.zkTotal.toFixed(2);
+                            _this.order.total = order.total.toFixed(2);
 
                             //支付金额计算
                             _this.order.items.forEach(item => {

--
Gitblit v1.9.1