Merge branch 'master' of ssh://118.31.104.155:4422/mnt/git/v2.tiantianxinye.365care

app/Http/Controllers/Manager/OrdersController.php

@@ -587,6 +587,16 @@ class OrdersController extends CommonController
      */
     public function createOrder()
     {
+        //如果开始日期比当前日期早 2 天以上，拒绝
+        $from_date = request()->from_date;
+        if (strtotime($from_date) < strtotime('-2 days')) {
+            return response()->json([
+                "errorcode" => "104",
+                "errormsg" => "开始日期不能早于当前日期 2 天以上"
+            ]);
+        }
+
+
         DB::beginTransaction();
         try {
             $mobile = request()->mobile ?? request()->patient_mobile;
@@ -1663,7 +1673,7 @@ class OrdersController extends CommonController
      *     description="现金或pos刷卡充值",
      *     @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"),
      *     @OA\Parameter(name="id", in="path", @OA\Schema(type="integer"), required=true, description="订单id"),
-     *     @OA\Parameter(name="payment", in="query", @OA\Schema(type="string"), required=true, description="枚举：pos=>pos机刷卡支付, cash=>现金支付"),
+     *     @OA\Parameter(name="payment", in="query", @OA\Schema(type="string"), required=true, description="枚举：pos=>刷卡支付, cash=>现金支付, offline_pos=>线下POS收款, offline_cash=>线下现金收款, offline_qrcode=>线下二维码收款, transfer=>转账"),
      *     @OA\Parameter(name="money", in="query", @OA\Schema(type="number"), required=true, description="金额，非负数"),
      *     @OA\Parameter(name="remark", in="query", @OA\Schema(type="string"), required=false, description="备注信息：现金支付时可以忽略；刷卡支付时，填入回单号或卡号以便财务对账"),
      *     @OA\Response(
@@ -1697,6 +1707,10 @@ class OrdersController extends CommonController
             switch (request()->payment) {
                 case "pos":
                 case "cash":
+                case "offline_pos":
+                case "offline_cash":
+                case "offline_qrcode":
+                case "transfer":
                     $recharge["remark"] = request()->remark;
                     break;
                 default:
@@ -1744,7 +1758,7 @@ class OrdersController extends CommonController
      *     @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"),
      *     @OA\Parameter(name="id", in="path", @OA\Schema(type="integer"), required=true, description="订单id"),
      *     @OA\Parameter(name="money", in="query", @OA\Schema(type="number"), required=true, description="金额，非负数"),
-     *     @OA\Parameter(name="payment", in="query", @OA\Schema(type="string"), required=true, description="退款方式：枚举cash，weixin，alipay。注意可用的退款方式从支付明细或结单时的交互反馈得出，随意提交金额可能会造成问题"),
+     *     @OA\Parameter(name="payment", in="query", @OA\Schema(type="string"), required=true, description="退款方式：枚举cash,pos,offline_cash,offline_pos,offline_qrcode,transfer,weixin,alipay。注意可用的退款方式从支付明细或结单时的交互反馈得出，随意提交金额可能会造成问题"),
      *     @OA\Parameter(name="recharge_id", in="query", @OA\Schema(type="integer"), required=false, description="相关在线支付的id，用于原路返回。退款方式为weixin或alipay时，必须给出"),
      *     @OA\Parameter(name="remark", in="query", @OA\Schema(type="string"), required=false, description="备注信息"),
      *     @OA\Response(
@@ -1770,6 +1784,10 @@ class OrdersController extends CommonController
             switch (request()->payment) {
                 case "cash":
                 case "pos":
+                case "offline_cash":
+                case "offline_pos":
+                case "offline_qrcode":
+                case "transfer":
                     $refund["payment"] = request()->payment;
                     $refund["paid_at"] = date("Y-m-d H:i:s");
                     break;

app/Models/Recharge.php

@@ -13,7 +13,11 @@ class Recharge extends SoftDeletesModel
         "cash" => "现金",
         "weixin" => "微信",
         "alipay" => "支付宝",
-        "pos" => "POS机"
+        "pos" => "POS机",
+        "offline_pos" => "线下POS",
+        "offline_cash" => "线下现金",
+        "offline_qrcode" => "线下二维码",
+        "transfer" => "转账"
     ];
     public $payment_online_methods = [
         "weixin" => "微信",

app/Models/Refund.php

@@ -25,6 +25,21 @@ class Refund extends SoftDeletesModel
             case "cash":
                 $payment_label = "现金";
                 break;
+            case "pos":
+                $payment_label = "POS机";
+                break;
+            case "offline_cash":
+                $payment_label = "线下现金";
+                break;
+            case "offline_pos":
+                $payment_label = "线下POS";
+                break;
+            case "offline_qrcode":
+                $payment_label = "线下二维码";
+                break;
+            case "transfer":
+                $payment_label = "转账";
+                break;
         }
         return $payment_label;
     }
@@ -70,7 +85,12 @@ class Refund extends SoftDeletesModel
     public function autoRefund()
     {
         $threshold = 5;
-        $refunds = $this->with("relatedRecharge")->whereNull("paid_at")->where("payment", "<>", "cash")->where("try_times", "<", $this->tryTimes)->limit($threshold)->get();
+        $refunds = $this->with("relatedRecharge")
+            ->whereNull("paid_at")
+            ->whereIn("payment", ["weixin", "alipay"])
+            ->where("try_times", "<", $this->tryTimes)
+            ->limit($threshold)
+            ->get();
 
         foreach ($refunds as $refund) {
             switch ($refund->relatedRecharge->payment) {

public/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>护工管理</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.ed4a2d2b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.2037823a.js></script><script src=/h5/static/js/index.e62bb5c2.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.ed4a2d2b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.2037823a.js></script><script src=/h5/static/js/index.53296334.js></script></body></html>