fix():增加分类

application/api/BaseController.php

@@ -60,6 +60,7 @@ abstract class BaseController {
             '/api/token/getToken',
             '/api/index',
             '/api/user/login',
+            '/api/user/save',
             '/api/admin/login',
             '/api/admin/verifyimg',
             '/api/order/notifyorder'

application/api/controller/Company.php

@@ -68,7 +68,7 @@ class Company extends BaseController {
      *           @OA\Property(description="公司名称", property="name", type="string", default="jj公司"),
      *           @OA\Property(description="集团id", property="groupId", type="integer", default="1"),
      *           @OA\Property(description="公司code", property="code", type="string", default="a01"),
-     *           @OA\Property(description="支付id", property="payId", type="integer", default="1"),
+     *           @OA\Property(description="payCode", property="payCode", type="integer", default="1"),
      *           @OA\Property(description="状态 1正常  2删除", property="status", type="integer", default="1"),
      *           required={"name","groupId","code","payId"})
      *       )
@@ -82,7 +82,7 @@ class Company extends BaseController {
             'name|公司名称'    => 'require',
             'code|公司code'  => 'require',
             'groupId|集团id' => 'require',
-            'payId|支付id'   => 'require',
+            'payCode|支付code'   => 'require',
         ];
         Until::check($rule, $input);
         $model = new CompanyModel();
@@ -100,7 +100,7 @@ class Company extends BaseController {
                 'company_name' => $input['name'],
                 'company_code' => $input['code'],
                 'group_id'     => $input['groupId'],
-                'pay_id'       => $input['payId'],
+                'pay_id'       => $input['payCode'],
                 'status'       => $input['status'] ?? 1
             ]);
         } else {
@@ -108,7 +108,7 @@ class Company extends BaseController {
                 'company_name' => $input['name'],
                 'company_code' => $input['code'],
                 'group_id'     => $input['groupId'],
-                'pay_id'       => $input['payId'],
+                'pay_id'       => $input['payCode'],
             ]);
         }
         $info = $model::get($id);

application/api/model/StoreModel.php

@@ -6,6 +6,7 @@
 
 namespace app\api\model;
 
+use app\api\exception\ApiException;
 use app\common\until\Until;
 use think\Db;
 
@@ -72,4 +73,20 @@ class StoreModel  extends BaseModel {
             ->find();
         return Until::modelToArray($select);
     }
+
+    public function getPayCode($storeId) {
+        $rs = $this->alias('s')
+            ->field('s.pay_code as storePayCode,c.pay_code as companyPayCode')
+            ->join('company c', 'c.id = s.company_id', 'left')
+            ->where(['s.id' => $storeId])
+            ->find();
+        $rs = Until::modelToArray($rs);
+        if (!empty($rs['storePayCode'])){
+            return $rs['storePayCode'];
+        }
+        if (!empty($rs['companyPayCode'])) {
+            return $rs['companyPayCode'];
+        }
+        throw new ApiException('缺少支付配置');
+    }
 }

application/common/service/OrderService.php

@@ -13,6 +13,7 @@ use app\api\model\CartModel;
 use app\api\model\OrderModel;
 use app\api\model\OrderProductModel;
 use app\api\model\ProductModel;
+use app\api\model\StoreModel;
 use app\api\model\UserModel;
 use app\api\model\WriteOffModel;
 use app\common\until\Until;
@@ -29,6 +30,7 @@ class OrderService {
 
 
     public function payOrder($input) {
+        $payCode = (new StoreModel())->getPayCode($input['storeId']);
         $this->time[] = 'start' . time();
         $orderSn = Until::createSn();
         $productInfo = (new ProductModel())::where(['id' => $input['productId']])->find();
@@ -102,7 +104,7 @@ class OrderService {
                 'mark'     => '购买了' . $productInfo['product_name'],
                 'orderId'  => $orderSn,
                 'username' => $userInfo['name'],
-                'payCode'  => strtoupper($this->userName),
+                'payCode'  => strtoupper($payCode),
             ];
             $this->time[] = 'leo-start' . time();
             $wxOrderInfo = $this->createOrderForOther($otherData);
@@ -134,6 +136,7 @@ class OrderService {
             $storeId = $info['store_id'];
             $orderMoney += $info['num'] * $info['current_price'];
         }
+        $payCode = (new StoreModel())->getPayCode($storeId);
         $userInfo = (new UserModel())::where(['id' => Until::$userId])->find();
         $userInfo = Until::modelToArray($userInfo);
         if (empty($userInfo)) {
@@ -198,7 +201,7 @@ class OrderService {
                 'mark'     => '购买了小食',
                 'orderId'  => $orderSn,
                 'username' => $userInfo['name'],
-                'payCode'  => strtoupper($this->userName),
+                'payCode'  => strtoupper($payCode),
             ];
             $this->time[] = 'leo-start' . time();
             $wxOrderInfo = $this->createOrderForOther($otherData);
@@ -220,6 +223,7 @@ class OrderService {
     public function payAgain(int $orderId) {
         $model = new OrderModel();
         $info = $model::where(['id' => $orderId])->find();
+        $payCode = (new StoreModel())->getPayCode($info['store_id']);
 //        $productInfo = (new ProductModel())::where(['id' => $info['product_id']])->find();
         if ($info['status'] === OrderModel::IS_PAY) {
             throw new ApiException('订单已支付');
@@ -237,7 +241,7 @@ class OrderService {
             'mark'     => '购买了商品',
             'orderId'  => $paySn,
             'username' => $userInfo['name'],
-            'payCode'  => strtoupper($this->userName),
+            'payCode'  => strtoupper($payCode),
         ];
         $wxOrderInfo = $this->createOrderForOther($otherData);
         $order = [

public/api.yaml

@@ -486,8 +486,8 @@ paths:
                   description: 公司code
                   type: string
                   default: a01
-                payId:
-                  description: 支付id
+                payCode:
+                  description: payCode
                   type: integer
                   default: '1'
                 status:
@@ -791,7 +791,7 @@ paths:
           schema:
             type: '2020-01-02,2021-12-30'
         -
-          name: createTime
+          name: createTcreateTimeime
           in: query
           description: 订单时间
           schema:
@@ -799,7 +799,7 @@ paths:
         -
           name: orderType
           in: query
-          description: '订单类型 1小程序下单 2后台增加'
+          description: '订单类型 1小程序下单 2后台增加 3点餐'
           schema:
             type: string
       requestBody: {  }
@@ -1272,7 +1272,11 @@ paths:
                   default: '1'
                 remark:
                   description: 备注
-                  type: dtring
+                  type: string
+                  default: xx支付
+                groupId:
+                  description: 集团id
+                  type: string
                   default: xx支付
               type: object
       responses: