提交代码

service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java

@@ -57,7 +57,7 @@ public class BsTradeOrderServiceImpl implements BsTradeOrderService {
     @Resource
     private UserDiscountService userDiscountService;
     @Resource
-    private BsMerPlatformNoRateService merPlatformNoRateService;
+    private BsMerRateService merRateService;
 
     @Override
     public void editOrder(BsTradeOrder tradeOrder) {
@@ -222,6 +222,19 @@ public class BsTradeOrderServiceImpl implements BsTradeOrderService {
             tradeOrder.setStatus(TradeOrderStatusEnum.status3.getNumber());
             tradeOrder.setPayTime(new Date());
 
+            // WECHAT   ALIPAY
+            if (tradeOrder.getPayMode().equals(TradeOrderPayModeEnum.WECHAT.getCode())) {
+                BsMerRate rate = merRateService.getDetail(tradeOrder.getMerId(), 302);
+                if (rate != null) {
+                    tradeOrder.setFeeRate(rate.getRatePct());
+                }
+            } else if (tradeOrder.getPayMode().equals(TradeOrderPayModeEnum.ALIPAY.getCode())) {
+                BsMerRate rate = merRateService.getDetail(tradeOrder.getMerId(),303);
+                if (rate != null) {
+                    tradeOrder.setFeeRate(rate.getRatePct());
+                }
+            }
+
             if (StringUtils.isNotBlank(MapUtils.getString(other, "log_no"))) {
                 tradeOrder.setPlatformLogNo(MapUtils.getString(other, "log_no"));
             }