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

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java

@@ -397,9 +397,14 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		orderInfo.setAmount(new BigDecimal(amount.get()));
 		orderInfo.setNumber(number.get());
 		orderInfo.setTotalAmount(orderInfo.getAmount());
-		if (orderInfo.getAmount().compareTo(BigDecimal.ZERO) <= 0 || orderInfo.getTotalAmount().compareTo(BigDecimal.ZERO) <= 0) {
+		if (orderInfo.getAmount().compareTo(BigDecimal.ZERO) < 0 || orderInfo.getTotalAmount().compareTo(BigDecimal.ZERO) < 0) {
 			return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "订单金额不能为0");
 		}
+		if (orderInfo.getTotalAmount().compareTo(BigDecimal.ZERO) ==  0) {
+			orderInfo.setStatus(OrderStatusEnum.ORDER_SEND.getType());
+			orderInfo.setPayStatus(2);
+		}
+
 		//订单发票信息
 		if (orderInfoDto.getUserInvoiceId() != null) {
 			UserInvoice userInvoice = userInvoiceBiz.selectById(orderInfoDto.getUserInvoiceId());