订单线上退款bugfix

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

@@ -126,6 +126,10 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             model.addAttribute("errorMsg", "待确认,待收待发订单 不能申请退款");
             return "待确认,待收待发订单 不能申请退款";
         }
+        Integer changeFlag=0;
+        if("2".equals(cmReturnedPurchase.getReturnedWay())){
+            changeFlag=1;
+        }
         cmReturnedPurchase.setReturnedWay("1");
         if (NewOrderStatus.isNotPay(newOrder.getStatus())) {
             //未支付订单无退款
@@ -230,7 +234,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                 }
             }
         }
-        if (1 == cmReturnedPurchase.getRefundType() && !"2".equals(cmReturnedPurchase.getReturnedWay())) {
+        if (1 == cmReturnedPurchase.getRefundType() && 0==changeFlag) {
             if (newOrder.getPromotionFullReduction() != null) {
                 //减去促销满减金额
                 returnedPurchaseFee = returnedPurchaseFee - newOrder.getPromotionFullReduction();