Merge branch 'master' of hyq/kmall-pt into master

kmall-api/src/main/java/com/kmall/api/entity/OrderVo.java

@@ -655,6 +655,8 @@ public class OrderVo implements Serializable {
         //如果订单没有被取消，且没有支付，则可支付，可取消
         if (order_status == 0) {
             handleOption.put("cancel", true);
+        }
+        if (order_status == 0 && pay_status == 0) {
             handleOption.put("pay", true);
         }