修改支付若干

src/main/java/com/ygj/yuemum/service/order/YSOrderService.java

@@ -81,7 +81,16 @@ public class YSOrderService {
     }
 
     public List<YSOrder> queryMineOrder(String od_phone) {
-        return YSOrderDao.queryMineOrder(od_phone);
+        List<YSOrder> ysOrders = YSOrderDao.queryMineOrder(od_phone);
+        for (YSOrder ysOrder:ysOrders) {
+            float amount = ysOrder.getOd_order_amount();
+            float mgm_dis = ysOrder.getOd_mgm_discount();
+            float mgm_other = ysOrder.getOd_other_discount();
+            float mgm_promotion = ysOrder.getOd_promotion_discount();
+            float realAmount  = amount - mgm_dis - mgm_other - mgm_promotion;
+            ysOrder.setOd_order_amount(realAmount);
+        }
+        return ysOrders;
     }
 
     public List<YSOrder> getAll() {
@@ -139,12 +148,12 @@ public class YSOrderService {
                     pay_sum = pay_sum + Float.parseFloat(String.valueOf(customerPay.getCp_payamount()));
                 }
                 if (customerPays.size() >= ratioArray.length) {
-                    ysOrder.setOd_order_pay_amount(ysOrder.getOd_order_amount() - pay_sum);
+                    ysOrder.setOd_order_pay_amount((ysOrder.getOd_order_amount() - discount) - pay_sum);
                 } else {
-                    ysOrder.setOd_order_pay_amount(ysOrder.getOd_order_amount() * Float.parseFloat(ratioArray[customerPays.size()]));
+                    ysOrder.setOd_order_pay_amount((ysOrder.getOd_order_amount() - discount) * Float.parseFloat(ratioArray[customerPays.size()]));
                 }
                 if(pay_sum + ysOrder.getOd_order_pay_amount() > ysOrder.getOd_order_amount()) {
-                    ysOrder.setOd_order_pay_amount(ysOrder.getOd_order_pay_amount() - pay_sum);
+                    ysOrder.setOd_order_pay_amount((ysOrder.getOd_order_amount() - discount) - pay_sum);
                 }
             } else {
                 ysOrder.setOd_order_pay_amount((ysOrder.getOd_order_amount() - discount) * Float.parseFloat(ratioArray[0]));

src/main/resources/application-test.yml

@@ -76,27 +76,27 @@ coupon:
 #  HTTPDIANPINGIMGURL: "http://127.0.0.1:8080/MiniProgram/dianping/"
 #测试
 file:
-  ROOT : "/home/tomcat/apache-tomcat-9.0.30/webapps/resume/img/"
-  ResumeFile : "/home/tomcat/apache-tomcat-9.0.30/webapps/resume/"
+  ROOT : "/usr/local/apache-tomcat-9.0.30/webapps/resume/img/"
+  ResumeFile : "/usr/local/apache-tomcat-9.0.30/webapps/resume/"
   httpRoot : "http://218.78.47.145:3306/resume/img/"
   httphtmlRoot : "http://218.78.47.145:3306/resume/"
-  modulePath : "/home/tomcat/apache-tomcat-9.0.30/webapps/resume/resume.html"
-  payvoucher : "/home/tomcat/apache-tomcat-9.0.30/webapps/payvoucher"
+  modulePath : "/usr/local/apache-tomcat-9.0.30/webapps/resume/resume.html"
+  payvoucher : "/usr/local/apache-tomcat-9.0.30/webapps/payvoucher"
   httppayvoucher : "http://218.78.47.145:3306/payvoucher"
-  promotionvoucher : "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/promotion/offline"
+  promotionvoucher : "/usr/local/apache-tomcat-9.0.30/webapps/MiniProgram/promotion/offline"
   httppromotionvoucher : "http://218.78.47.145:3306/MiniProgram/promotion/offline"
-  qrcode: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm"
+  qrcode: "/usr/local/apache-tomcat-9.0.30/webapps/MiniProgram/mgm"
   httpqrcode: "http://218.78.47.145:3306/MiniProgram/mgm"
-  IMGBANKCARD: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm/bankCard/"
+  IMGBANKCARD: "/usr/local/apache-tomcat-9.0.30/webapps/MiniProgram/mgm/bankCard/"
   HTTPIMGBANKCARD: "http://218.78.47.145:3306/MiniProgram/mgm/bankCard/"
-  LOCALQRCODE: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm"
-  DEMOQRCODE: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm/pop"
+  LOCALQRCODE: "/usr/local/apache-tomcat-9.0.30/webapps/MiniProgram/mgm"
+  DEMOQRCODE: "/usr/local/apache-tomcat-9.0.30/webapps/MiniProgram/mgm/pop"
   HTTPOPPQRCODE: "http://218.78.47.145:3306/MiniProgram/mgm/pop"
-  TESTQRCODE: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/promotion/test"
+  TESTQRCODE: "/usr/local/apache-tomcat-9.0.30/webapps/MiniProgram/promotion/test"
   HTTTESTQRCODE: "http://218.78.47.145:3306/MiniProgram/promotion/test/dc"
-  BANNERIMGURL: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/index/banner/"
+  BANNERIMGURL: "/usr/local/apache-tomcat-9.0.30/webapps/MiniProgram/index/banner/"
   HTTPBANNERIMGURL: "http://218.78.47.145:3306/MiniProgram/index/banner/"
-  DIANPINGIMGURL: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/dianping/"
+  DIANPINGIMGURL: "/usr/local/apache-tomcat-9.0.30/webapps/MiniProgram/dianping/"
   HTTPDIANPINGIMGURL: "http://218.78.47.145:3306/MiniProgram/dianping/"
 #生产
 #file: