退款bugfix

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

@@ -126,9 +126,9 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             model.addAttribute("errorMsg", "待确认,待收待发订单 不能申请退款");
             return "待确认,待收待发订单 不能申请退款";
         }
-        Integer changeFlag=0;
-        if("2".equals(cmReturnedPurchase.getReturnedWay())){
-            changeFlag=1;
+        Integer changeFlag = 0;
+        if ("2".equals(cmReturnedPurchase.getReturnedWay())) {
+            changeFlag = 1;
         }
         cmReturnedPurchase.setReturnedWay("1");
         if (NewOrderStatus.isNotPay(newOrder.getStatus())) {
@@ -234,7 +234,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                 }
             }
         }
-        if (1 == cmReturnedPurchase.getRefundType() && 0==changeFlag) {
+        if (1 == cmReturnedPurchase.getRefundType() && 0 == changeFlag) {
             if (newOrder.getPromotionFullReduction() != null) {
                 //减去促销满减金额
                 returnedPurchaseFee = returnedPurchaseFee - newOrder.getPromotionFullReduction();
@@ -592,7 +592,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                 cmUserBalanceRecord.setReturnedId(Integer.parseInt(returnedPurchase.getId()));
                 cmUserBalanceRecord.setDelFlag("0");
 
-                if (1 == newOrder.getRechargeGoods() || 2 == newOrder.getRechargeGoods()) {
+                if (null != newOrder.getRechargeGoods() && 1 == newOrder.getRechargeGoods() || 2 == newOrder.getRechargeGoods()) {
                     user.setUserMoney(userMoney - refundFee);
                     cmUserBalanceRecord.setAmount(String.valueOf(refundFee));
                     cmUserBalanceRecord.setType("2");