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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -307,6 +307,9 @@ public class PayOrderLogic {
 
         workerOrderBuy.setNum(num);
         workerOrderBuy.updateById();
+        if (workerOrderBuy.getTotalAmount().doubleValue() <= 0){
+            throw new RemoteServiceException("金额小于等于0，不允许支付");
+        }
 
         workerOrderItemService.saveBatch(workerOrderBuy.getWorkerOrderItems());
 
@@ -656,6 +659,8 @@ public class PayOrderLogic {
                 workerOrder.setTranscationId(transcationId);
                 workerOrder.setOpenId(currentCompanyWechat.getUser().getMiniOpenId());
                 workerOrder.setPayState(IsYesNoEnum.YES.getKey());
+            }else {
+                throw new RemoteServiceException("金额小于等于0，不允许支付");
             }