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

bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java

@@ -106,7 +106,9 @@ public class PayController {
             if (EPayStatus.PAID.getValue() == onlinePayment.getPayStatus()) {
                 return AjaxResult.error("该订单已支付");
             }
-
+            if(ObjectUtil.isEmpty(onlinePayment.getPayMoney())){
+                return AjaxResult.error("当前订单已经发起过支付，如需再次购买，请重新下单!");
+            }
             // 同一业务订单多次使用不同支付数据，以最新一次为准
             onlinePayment.setPayChannel(payChannel.getValue());
             onlinePayment.setPayType(payType.getValue());