支付问题修改

src/main/java/com/ygj/yuemum/controller/order/YSOrderController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Api(tags = "月嫂订单相关接口")
 @RestController
@@ -79,8 +80,10 @@ public class YSOrderController {
         Map<String, Object> tableData = new HashMap<>();
         YSOrder order = YSOrderService.getYSOrder(id);
         List<CustomerPay> customerPays = customerPayService.selectCustomerPay(order.getOd_no());
+        Double paySum = customerPays .stream().collect(Collectors.summingDouble(CustomerPay::getCp_payamount));
         tableData.put("orderInfo", order);
         tableData.put("orderPay",customerPays);
+        tableData.put("paySum",paySum);
         return tableData;
     }
 

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

@@ -138,7 +138,7 @@ public class YSOrderService {
                 for(CustomerPay customerPay:customerPays) {
                     pay_sum = pay_sum + Float.parseFloat(String.valueOf(customerPay.getCp_payamount()));
                 }
-                if (customerPays.size() > ratioArray.length) {
+                if (customerPays.size() >= ratioArray.length) {
                     ysOrder.setOd_order_pay_amount(ysOrder.getOd_order_amount() - pay_sum);
                 } else {
                     ysOrder.setOd_order_pay_amount(ysOrder.getOd_order_amount() * Float.parseFloat(ratioArray[customerPays.size()]));

src/main/resources/application-dev.yml

@@ -51,53 +51,53 @@ coupon:
 #  RechargeTaskCoupon : "PVP2018051714111"
 #图片上传路径--------------------------
 #本地
-#file:
-#  ROOT : "D:/apache-tomcat-9.0.29/webapps/resume/img/"
-#  ResumeFile : "D:/apache-tomcat-9.0.29/webapps/resume/"
-#  httpRoot : "http://localhost:8080/resume/img/"
-#  httphtmlRoot : "http://localhost:8080/resume/"
-#  modulePath : "D:/apache-tomcat-9.0.29/webapps/resume/resume.html"
-#  payvoucher : "D:/apache-tomcat-9.0.29/webapps/payvoucher"
-#  httppayvoucher : "http://localhost:8080/payvoucher"
-#  promotionvoucher : "D:/apache-tomcat-9.0.29/webapps/MiniProgram/promotion/offline"
-#  httppromotionvoucher : "http://localhost:8080/MiniProgram/promotion/offline"
-#  qrcode: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm"
-#  httpqrcode: "http://127.0.0.1:8080/MiniProgram/mgm"
-#  IMGBANKCARD: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm/bankCard/"
-#  HTTPIMGBANKCARD: "http://127.0.0.1:8080/MiniProgram/mgm/bankCard/"
-#  LOCALQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm"
-#  DEMOQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm/pop"
-#  HTTPOPPQRCODE: "http://127.0.0.1:8080/MiniProgram/mgm/pop"
-#  TESTQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/promotion/test"
-#  HTTTESTQRCODE: "http://127.0.0.1:8080/MiniProgram/promotion/test/dc"
-#  BANNERIMGURL: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/index/banner/"
-#  HTTPBANNERIMGURL: "http://127.0.0.1:8080/MiniProgram/index/banner/"
-#  DIANPINGIMGURL: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/dianping/"
-#  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/"
-  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"
-  httppayvoucher : "http://218.78.47.145:3306/payvoucher"
-  promotionvoucher : "/home/tomcat/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"
-  httpqrcode: "http://218.78.47.145:3306/MiniProgram/mgm"
-  IMGBANKCARD: "/home/tomcat/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"
-  HTTPOPPQRCODE: "http://218.78.47.145:3306/MiniProgram/mgm/pop"
-  TESTQRCODE: "/home/tomcat/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/"
-  HTTPBANNERIMGURL: "http://218.78.47.145:3306/MiniProgram/index/banner/"
-  DIANPINGIMGURL: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/dianping/"
-  HTTPDIANPINGIMGURL: "http://218.78.47.145:3306/MiniProgram/dianping/"
+  ROOT : "D:/apache-tomcat-9.0.29/webapps/resume/img/"
+  ResumeFile : "D:/apache-tomcat-9.0.29/webapps/resume/"
+  httpRoot : "http://localhost:8080/resume/img/"
+  httphtmlRoot : "http://localhost:8080/resume/"
+  modulePath : "D:/apache-tomcat-9.0.29/webapps/resume/resume.html"
+  payvoucher : "D:/apache-tomcat-9.0.29/webapps/payvoucher"
+  httppayvoucher : "http://localhost:8080/payvoucher"
+  promotionvoucher : "D:/apache-tomcat-9.0.29/webapps/MiniProgram/promotion/offline"
+  httppromotionvoucher : "http://localhost:8080/MiniProgram/promotion/offline"
+  qrcode: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm"
+  httpqrcode: "http://127.0.0.1:8080/MiniProgram/mgm"
+  IMGBANKCARD: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm/bankCard/"
+  HTTPIMGBANKCARD: "http://127.0.0.1:8080/MiniProgram/mgm/bankCard/"
+  LOCALQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm"
+  DEMOQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm/pop"
+  HTTPOPPQRCODE: "http://127.0.0.1:8080/MiniProgram/mgm/pop"
+  TESTQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/promotion/test"
+  HTTTESTQRCODE: "http://127.0.0.1:8080/MiniProgram/promotion/test/dc"
+  BANNERIMGURL: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/index/banner/"
+  HTTPBANNERIMGURL: "http://127.0.0.1:8080/MiniProgram/index/banner/"
+  DIANPINGIMGURL: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/dianping/"
+  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/"
+#  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"
+#  httppayvoucher : "http://218.78.47.145:3306/payvoucher"
+#  promotionvoucher : "/home/tomcat/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"
+#  httpqrcode: "http://218.78.47.145:3306/MiniProgram/mgm"
+#  IMGBANKCARD: "/home/tomcat/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"
+#  HTTPOPPQRCODE: "http://218.78.47.145:3306/MiniProgram/mgm/pop"
+#  TESTQRCODE: "/home/tomcat/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/"
+#  HTTPBANNERIMGURL: "http://218.78.47.145:3306/MiniProgram/index/banner/"
+#  DIANPINGIMGURL: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/dianping/"
+#  HTTPDIANPINGIMGURL: "http://218.78.47.145:3306/MiniProgram/dianping/"
 #生产
 #file:
 #  ROOT : "/usr/local/tomcat/tomcat7/webapps/resume/img/"