bugfix

pom.xml

@@ -111,11 +111,6 @@
 			<version>5.7.16</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk15to18</artifactId>
-			<version>1.69</version>
-		</dependency>
 
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -749,13 +744,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk15on</artifactId>
-			<version>1.47</version>
-		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcmail-jdk15on</artifactId>
-			<version>1.47</version>
+			<artifactId>bcmail-jdk15</artifactId>
+			<version>1.46</version>
 		</dependency>
 		<!--twelvemonkeys图片处理-->
 		<dependency>

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -699,9 +699,10 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                             //佣金>最高手续费可以线上，否则线下
                             double bro = MathUtil.sub(realPay, shopOrder.getShouldPayShopAmount()).doubleValue();
                             if (bro < 0) {
-                                onlinePay=false;
+                                onlinePay = false;
                             } else {
                                 double WXCharge = MathUtil.mul(realPay, 0.0065, 2).doubleValue();
+                                double QuickCharge = MathUtil.mul(realPay, 0.006, 2).doubleValue();
                                 double AliCharge = MathUtil.mul(realPay, 0.0025, 2).doubleValue();
                                 double B2CCharge = MathUtil.mul(realPay, 0.002, 2).doubleValue();
                                 //佣金和手续费比较,佣金>手续费则可以走当前支付渠道
@@ -711,9 +712,10 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                                 payWays += bro >= AliCharge ? ",2" : "";
                                 payWays += bro >= B2CCharge ? ",3" : "";
                                 payWays += bro >= 10 ? ",4" : "";
+                                payWays += bro >= QuickCharge ? ",5" : "";
                                 //小于所有的情况下线下补手续费，开放所有渠道
                                 if ("".equals(payWays)) {
-                                    payWays = "1,2,3,4";
+                                    payWays = "1,2,3,4,5";
                                 }
                                 shopOrder.setOnlinePayWays(payWays);
                             }
@@ -730,9 +732,10 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                             shopOrder.setRealPay(realPay);
                             shopOrder.setEachDiscount(0d);
                             if (bro < 0) {
-                                onlinePay=false;
+                                onlinePay = false;
                             } else {
                                 double WXCharge = MathUtil.mul(realPay, 0.0065, 2).doubleValue();
+                                double QuickCharge = MathUtil.mul(realPay, 0.006, 2).doubleValue();
                                 double AliCharge = MathUtil.mul(realPay, 0.0025, 2).doubleValue();
                                 double B2CCharge = MathUtil.mul(realPay, 0.002, 2).doubleValue();
                                 //佣金和手续费比较,佣金>手续费则可以走当前支付渠道
@@ -742,9 +745,10 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                                 payWays += bro >= AliCharge ? ",2" : "";
                                 payWays += bro >= B2CCharge ? ",3" : "";
                                 payWays += bro >= 10 ? ",4" : "";
+                                payWays += bro >= QuickCharge ? ",5" : "";
                                 //小于所有的情况下线下补手续费，开放所有渠道
                                 if ("".equals(payWays)) {
-                                    payWays = "1,2,3,4";
+                                    payWays = "1,2,3,4,5";
                                 }
                                 shopOrder.setOnlinePayWays(payWays);
                             }
@@ -1292,7 +1296,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             if (CollectionUtils.isNotEmpty(shopOrders)) {
                 for (NewShopOrder shopOrder : shopOrders) {
                     List<String> code = newShopOrderDao.findCommercialCode(shopOrder.getOrderID());
-                    for (String str: code) {
+                    for (String str : code) {
                         if ("E1807059160".equals(str)) {
                             shopOrder.setCommercialCode("E1807059160");
                         }
@@ -1462,7 +1466,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                                 item = 1;
                                 newOrder.setProductCode(1);
                             }
-                            if (item != 1){
+                            if (item != 1) {
                                 newOrder.setProductCode(2);
                             }
                             for (CmReturnedPurchaseProduct cmReturnedPurchaseProduct : cmReturnedPurchaseProductList) {
@@ -2760,7 +2764,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         return newOrderDao.getSplitRecord(orderID);
     }
 
-    public String productDataVerification(Integer orderID,String firstClubType) {
+    public String productDataVerification(Integer orderID, String firstClubType) {
         String mes = "";
         List<NewOrderProduct> productList = newOrderProductDao.findListProductOrderID(orderID);
         if (!"1".equals(firstClubType)) {