fix bug

@@ -122,14 +122,15 @@ public class PayServiceFactory implements ApplicationContextAware {
             payService = youfuAppWeixinPayService;
         }
 
-        else if (payment == Payment.ALIPAY) {
+        else if (payment == Payment.ALIPAY
+                || payment == Payment.ALIPAY_HB
+                || payment == Payment.ALIPAY_HBFQ) {
             payService = alipayService;
         } else if(payment == Payment.YOUFU_ALIPAY
-                || payment == Payment.ALIPAY_HB
-                || payment == Payment.ALIPAY_HBFQ){
+                || payment == Payment.YOUFU_ALIPAY_HB
+                || payment == Payment.YOUFU_ALIPAY_HBFQ){
             payService = youfuAlipayService;
         }
-
         else if (payment == Payment.MINIAPP) {
             payService = miniappWeixinPayService;
 

@@ -91,7 +91,7 @@ public class OrdersPayService {
                 .map(e -> convertToCmsPayVO(e))
                 .collect(Collectors.toList());
 
-//         >=6.9.21 启用新的支付主体
+//         >=6.9.23 启用新的支付主体
         replaceNewPayment(request, cmsPayRspList);
 
         if (request.getOrderCode() > 0){
@@ -147,7 +147,7 @@ public class OrdersPayService {
     }
 
     private void replaceNewPayment(OrderPayRequest request, List<PayListDetailVO.CmsPayVO> cmsPayRspList) {
-        // >=6.9.21 启用新的支付主体
+        // >=6.9.23 启用新的支付主体
         AppVersion currentAppVersion = AppVersion.of(request.getAppVersion());
         if (currentAppVersion.greaterThanOrEquals(AppVersion.of("6.9.23"))){
             // 新的版本,微信|支付宝 都使用新的appid

@@ -416,7 +416,8 @@ public class StoreSellerServiceImpl implements IStoredSellerService {
                                 OrderAttributes.FLAW.getCode(),OrderAttributes.SECOND_HAND.getCode(), OrderAttributes.ADVANCE_SALE.getCode()));
 
                 // 需要下架的skup
-                Pair<List<Integer>, Double> goodsEarnest = getDownselfSkupAppointMoney(sellerOrderGoods, YHMath.sub(statistics.getEarnestTotal(), statistics.getLeftMoney()), statistics.getUid());
+                Pair<List<Integer>, Double> goodsEarnest = getDownselfSkupAppointMoney(sellerOrderGoods,
+                        YHMath.sub(statistics.getEarnestTotal(), statistics.getLeftMoney()), statistics.getUid());
 
                 downSelfSkupMap.put(statistics.getUid(), goodsEarnest.getKey());
 
@@ -514,22 +515,21 @@ public class StoreSellerServiceImpl implements IStoredSellerService {
         for (SellerOrderGoods good : sellerOrderGoods){
 
             double rate = 0;
+            double skupEarnest = 0.00;
             if (good.getAttributes() == OrderAttributes.COMMON_IN_STOCK.getCode()
                     || good.getAttributes() == OrderAttributes.FLAW.getCode()
                     || good.getAttributes() == OrderAttributes.SECOND_HAND.getCode()){
                 rate = 0.04;
-                earnest = YHMath.add(earnest, YHMath.mul(good.getGoodsPrice().doubleValue(), rate));
-
-                earnest = redefinedEarnest(earnest, 200, 28);
+                skupEarnest = redefinedEarnest(YHMath.mul(good.getGoodsPrice().doubleValue(), rate), 200, 28);
+                earnest = YHMath.add(earnest, skupEarnest);
 
             }else if(good.getAttributes() == OrderAttributes.ADVANCE_SALE.getCode()){
                 rate = 0.08;
-                earnest = YHMath.add(earnest, YHMath.mul(good.getGoodsPrice().doubleValue(), rate));
-
-                earnest = redefinedEarnest(earnest, 400, 40);
-
+                skupEarnest = redefinedEarnest(YHMath.mul(good.getGoodsPrice().doubleValue(), rate), 400, 40);
+                earnest = YHMath.add(earnest, skupEarnest);
             }
 
+            scriptLogger.info("{} process calculate, skup {}, earnest", uid, skup, skupEarnest);
             skup.add(good.getId());
             // 一旦金额达到 指定的金额, 则不需要继续查找skup
             if (YHMath.sub(earnest, exceed) >= 0){

@@ -93,7 +93,7 @@ consumer:
           interval: 10
 
   #更新物流调拨信息
-  - address: 192.168.102.45:5672
+  - address: 192.168.104.244:5672
     username: yoho
     password: yoho
     consumers:
@@ -101,14 +101,14 @@ consumer:
         topic: ufo.order.updateExpressInfo
 
   #ocr百度云开关
-  - address: 192.168.102.45:5672
+  - address: 192.168.104.244:5672
     username: yoho
     password: yoho
     consumers:
       - class: com.yohoufo.user.consumer.OrcSwitchUpdateConsumer
         topic: reviewed.ocr.limit
 
-  - address: 192.168.102.45:5672
+  - address: 192.168.104.244:5672
     username: yoho
     password: yoho
     consumers:
@@ -127,19 +127,19 @@ consumer:
         ratelimit: 20
 
 producer:
-  - address: 192.168.102.45:5672
+  - address: 192.168.104.244:5672
     producers:
       - bean: browseProducer  #only once named in classpath
 
-  - address: 192.168.102.45:5672
+  - address: 192.168.104.244:5672
     producers:
       - bean: yhProducer
 
-  - address: 192.168.102.45:5672
+  - address: 192.168.104.244:5672
     producers:
       - bean: ufoExpressInfoProducer
 
-  - address: 192.168.102.45:5672
+  - address: 192.168.104.244:5672
     username: yoho
     password: yoho
     producers:
@@ -148,7 +148,7 @@ producer:
         confirmcallback: orderMessageConfirmCallback
 
   # crm
-  - address: 192.168.102.45:5672
+  - address: 192.168.104.244:5672
     producers:
       - bean: crmMqProducer
         trace: true
\ No newline at end of file