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

src/main/java/com/caimei/service/order/impl/OrderServiceImpl.java

@@ -384,7 +384,7 @@ public class OrderServiceImpl implements OrderService {
                 //获取用户最新余额
                 Double userMoney = personalMapper.ableUserMoney(userId);
                 logger.info(">>>>>" + userId + "userMoney:" + userMoney);
-                if (null != userMoney || userMoney > 0d) {
+                if (null != userMoney && userMoney > 0d) {
                     useBalanceFlag = true;
                     BigDecimal bdUserMoney = new BigDecimal(userMoney);
                     if (payTotalFee > userMoney) {//部分抵扣