退款bugfix

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

@@ -570,7 +570,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             }
             newOrderService.update(newOrder);
             //判断是否选择退回余额
-            if (("1".equals(returnedPurchase.getReturnedWay()) && returnedPurchase.getRefundBalanceFee() > 0d) || 1 == newOrder.getRechargeGoods() || 2 == newOrder.getRechargeGoods()) {
+            if ((StringUtils.isNotBlank(returnedPurchase.getReturnedWay())&&"1".equals(returnedPurchase.getReturnedWay()) && returnedPurchase.getRefundBalanceFee() > 0d) || (null!=newOrder.getRechargeGoods()&&(1 == newOrder.getRechargeGoods() || 2 == newOrder.getRechargeGoods()))) {
                 Double userMoney = user.getUserMoney();
                 Double ableUserMoney = user.getAbleUserMoney();
                 Double refundBalanceFee = returnedPurchase.getRefundBalanceFee();
@@ -579,7 +579,6 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                 if (ableUserMoney == null) ableUserMoney = 0d;
                 if (refundBalanceFee == null) refundBalanceFee = 0d;
                 user.setUserID(newOrder.getUserID());
-                logger.info("");
                 //添加余额收支记录
                 CmUserBalanceRecord cmUserBalanceRecord = new CmUserBalanceRecord();
                 cmUserBalanceRecord.setUserId(newOrder.getUserID());
@@ -612,7 +611,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             updateShopOrderAmount(newOrder.getOrderID());
 
             //判断是否有线上退款
-            if (returnedPurchase.getReturnedWay().equals("1") && returnedPurchase.getRefundOnlineFee() > 0) {
+            if ("1".equals(returnedPurchase.getReturnedWay()) && returnedPurchase.getRefundOnlineFee() > 0) {
                 List<Integer> shopOrderIds = cmReturnedPurchaseDao.getReturnShopOrder(returnedPurchase.getId());
                 if (null == shopOrderIds || 0 == shopOrderIds.size()) {
                     throw new Exception("退款子订单信息错误！");