Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java

@@ -112,11 +112,13 @@ public class OrderPayController extends BaseController {
         final BigDecimal batteryRent = goods.getBatteryRent();
         // 按新的续费价格
         orderPay.setTotalPrice(batteryRent);
+        if (one != null) {
             final long between = DateUtil.between(new Date(), one.getExpirationTime(), DateUnit.DAY, false);
             if (between < 0) {
                 // 有逾期的订单不能享受折扣
                 orderPay.setTotalPrice(rent);
             }
+        }
         return success(orderPay);
     }