兑换商品库存添加接口优化

app/admin/config/validate_rules.php

@@ -165,9 +165,8 @@ return [
     //【兑换商品库存】
     //添加
     'InventoryExchangeAdd' => [
-        'account_id|账户id' => 'require|number|gt:0',
-        'good_id|商品id' => 'require|number|gt:0',
-        'inventory|库存数' => 'require|number|gt:0|lt:999999999',
+        'group_id|分组id' => 'require|number|gt:0',
+        'list|兑换商品库存列表' => 'require|array|max:100',
     ],
 
     //【账户】

app/admin/controller/InventoryExchange.php

@@ -22,7 +22,7 @@ class InventoryExchange extends BaseController
     //添加兑换商品库存
     public function add()
     {
-        $param = $this->request->only(['account_id', 'good_id', 'inventory'], 'post');
+        $param = $this->request->only(['group_id', 'list'], 'post');
 
         $val = Validate::rule(Config::get('validate_rules.InventoryExchangeAdd'));
 

app/admin/logic/InventoryExchangeLogic.php

@@ -5,6 +5,7 @@ namespace app\admin\logic;
 use app\model\AccountModel;
 use app\model\CommonModel;
 use app\model\GoodModel;
+use app\model\GroupModel;
 use app\model\InventoryExchangeModel;
 use think\Exception;
 use think\exception\ValidateException;
@@ -43,55 +44,63 @@ class InventoryExchangeLogic extends BaseLogic
         Db::startTrans();
         try {
 
-            $rs = InventoryExchangeModel::field('id')
-                ->where([
-                    'account_id' => $data['account_id'],
-                    'good_id' => $data['good_id']
-                ])
+            $group = GroupModel::field('id,company_id,card_id')
+                ->where(['id' => $data['group_id'], 'is_del' => CommonModel::$del_normal])
                 ->findOrEmpty()
-                ->isEmpty();
-            if (!$rs) throw new Exception('该账号下的兑换商品库存已存在，不能重复添加');
+                ->toArray();
+            if (empty($group)) throw new Exception('该分组不存在');
 
-            $account = AccountModel::field('id,username,name')
-                ->where(['id' => $data['account_id'], 'is_del' => CommonModel::$del_normal])
-                ->findOrEmpty();
-            if ($account->isEmpty()) throw new Exception('该账号不存在');
+            $good_list = GoodModel::where(['is_del' => CommonModel::$del_normal, 'type' => GoodModel::$type_exchange])
+                ->whereIn('id', array_column($data['list'], 'good_id'))
+                ->column('id,good_code,good_name', 'id');
 
-            $good = GoodModel::field('id,good_code,good_name')
-                ->where(['id' => $data['good_id'], 'is_del' => CommonModel::$del_normal])
-                ->findOrEmpty();
-            if ($good->isEmpty()) throw new Exception('该商品不存在');
+            if (empty($good_list)) throw new Exception('该商品不存在');
 
-            $date = date('Y-m-d H:i:s');
+            $account_list = AccountModel::field('id,username,name')
+                ->where(['is_del' => CommonModel::$del_normal, 'company_id' => $group['company_id'], 'card_id' => $group['card_id']])
+                ->select()
+                ->toArray();
 
-            $inventory_exchange_id = Db::name('inventory_exchange')->insertGetId([
-                'account_id' => $data['account_id'],
-                'account_username' => $account->username,
-                'account_name' => $account->name,
-                'good_id' => $data['good_id'],
-                'good_code' => $good->good_code,
-                'good_name' => $good->good_name,
-                'inventory' => $data['inventory'],
-                'createrid' => self::$uid,
-                'creater' => self::$uname,
-                'addtime' => $date,
-                'updaterid' => self::$uid,
-                'updater' => self::$uname,
-                'updatetime' => $date,
-            ]);
-
-            Db::name('inventory_exchange_log')->insert([
-                'inventory_exchange_id' => $inventory_exchange_id,
-                'before_inventory' => 0,
-                'after_inventory' => $data['inventory'],
-                'good_id' => $data['good_id'],
-                'good_code' => $good->good_code,
-                'good_name' => $good->good_name,
-                'source' => CommonModel::$source_admin,
-                'createrid' => self::$uid,
-                'creater' => self::$uname,
-                'addtime' => $date,
-            ]);
+            $temp = InventoryExchangeModel::field('id,account_username,good_name')
+                ->whereIn('account_id', array_column($account_list, 'id'))
+                ->whereIn('good_id', array_column($good_list, 'id'))
+                ->findOrEmpty()
+                ->toArray();
+            if (!empty($temp)) throw new Exception('【' . $temp['account_username'] . '】账户的【' . $temp['good_name'] . '】商品库存记录已存在');
+
+            $date = date('Y-m-d H:i:s');
+            $inventory = array_column($data['list'], 'inventory', 'good_id');
+            foreach ($account_list as $account) {
+                foreach ($good_list as $good) {
+                    $inventory_exchange_id = Db::name('inventory_exchange')->insertGetId([
+                        'account_id' => $account['id'],
+                        'account_username' => $account['username'],
+                        'account_name' => $account['name'],
+                        'good_id' => $good['id'],
+                        'good_code' => $good['good_code'],
+                        'good_name' => $good['good_name'],
+                        'inventory' => $inventory[$good['id']] ?? 0,
+                        'createrid' => self::$uid,
+                        'creater' => self::$uname,
+                        'addtime' => $date,
+                        'updaterid' => self::$uid,
+                        'updater' => self::$uname,
+                        'updatetime' => $date,
+                    ]);
+                    Db::name('inventory_exchange_log')->insert([
+                        'inventory_exchange_id' => $inventory_exchange_id,
+                        'before_inventory' => 0,
+                        'after_inventory' => $inventory[$good['id']] ?? 0,
+                        'good_id' => $good['id'],
+                        'good_code' => $good['good_code'],
+                        'good_name' => $good['good_name'],
+                        'source' => CommonModel::$source_admin,
+                        'createrid' => self::$uid,
+                        'creater' => self::$uname,
+                        'addtime' => $date,
+                    ]);
+                }
+            }
 
             Db::commit();
 

app/mobile/controller/Account.php

@@ -49,5 +49,18 @@ class Account extends BaseController
         return AccountLogic::updatePassword($param);
     }
 
+    //通过微信端code绑定账户
+    public function bindAccountByCode()
+    {
+
+        $code = $this->request->param('code', '');
+
+        $val = Validate::rule(['code|微信端code' => 'require']);
+        if (!$val->check(['code' => $code])) throw new ValidateException($val->getError());
+
+        return AccountLogic::bindAccountByCode($code);
+
+    }
+
 
 }

app/mobile/controller/Common.php

@@ -6,6 +6,10 @@ use app\mobile\logic\CommonLogic;
 use app\admin\logic\CommonLogic as AdminCommonLogic;
 use app\BaseController;
 use app\mobile\logic\AccountLogic;
+use app\model\CommonModel;
+use think\exception\ValidateException;
+use think\facade\Config;
+use think\facade\Validate;
 
 //公共
 class Common extends BaseController
@@ -31,4 +35,27 @@ class Common extends BaseController
         return CommonLogic::theme();
     }
 
+    //微信支付预下单
+    public function getPrepayId(){
+
+        $param = $this->request->only(['type','list'],'post');
+
+        $val = Validate::rule([
+            'type|购买类型'=>'require|number|in:'.CommonModel::$pay_type_service.','.CommonModel::$pay_type_shopping_good,
+            'list|购买列表'=>'require|array|max:100',
+        ]);
+        if (!$val->check($param)) throw new ValidateException($val->getError());
+
+        $val2 = Validate::rule([
+            'id'=>'require|number|gt:0',
+            'num|购买数量'=>'require|number|max:99999999',
+        ]);
+
+        foreach ($param['list'] as $list){
+            if($val2->check($list)) throw new ValidateException($val2->getError());
+        }
+
+        return CommonLogic::getPrepayId($param);
+    }
+
 }

app/mobile/logic/AccountLogic.php

@@ -127,5 +127,18 @@ class AccountLogic extends BaseLogic
 
     }
 
+    //通过微信端code绑定账户
+    public static function bindAccountByCode(): Json
+    {
+
+        $openId = WechatLogic::getOauthAccessToken();
+
+        $rs = AccountModel::where('id', self::$aid)
+            ->save(['wx_openId' => $openId, 'updaterid' => self::$aid, 'updater' => self::$aname, 'updatetime' => date('Y-m-d H:i:s')]);
+
+        return $rs ? json_show(CommonModel::$success, '绑定成功') : json_show(CommonModel::$error_param, '绑定失败');
+
+    }
+
 
 }

app/mobile/logic/CommonLogic.php

@@ -5,8 +5,10 @@ namespace app\mobile\logic;
 use app\model\AccountModel;
 use app\model\CommonModel;
 use app\model\GroupModel;
+use app\model\ServiceModel;
 use app\model\ThemeModel;
 use app\model\VideoModel;
+use think\Exception;
 use think\facade\Db;
 use think\response\Json;
 
@@ -66,5 +68,55 @@ class CommonLogic extends BaseLogic
         return empty($rs) ? json_show(CommonModel::$error_param, '该手机主题不存在') : json_show(CommonModel::$success, '获取手机主题成功', $rs);
     }
 
+    //微信支付预下单
+    public static function getPrepayId(array $data = []): json
+    {
+
+        $openId = AccountModel::where(['id' => self::$aid, 'is_del' => CommonModel::$del_normal])
+            ->value('wx_openId', '');
+
+        if ($openId == '') return json_show(CommonModel::$error_token, '获取账户openId失败,请重新登录');
+
+        Db::startTrans();
+
+        try {
+
+
+            $amount = '0';//支付金额
+            if($data['type'] == CommonModel::$pay_type_service){
+                //购买服务
+                $rs=ServiceModel::field('id,original_price,activity_price,title,activity_status')
+                    ->whereIn('id',array_column($data['list'],'id'))
+                    ->where(['is_del'=>CommonModel::$del_normal,'status'=>CommonModel::$status_normal])
+                    ->select()
+                    ->toArray();
+                if(empty($rs)) throw new Exception('购买的服务不存在或已下架');
+
+                foreach ($rs as $item){
+
+                    if($item['activity_status'] == ServiceModel::$activity_status_ing) $amount = bcadd($amount,bcmul($rs['activity_price'],$),2);
+
+
+                }
+
+
+
+
+            }
+
+
+
+
+
+
+            Db::commit();
+            return json_show(CommonModel::$success, '微信支付预下单成功', $res);
+        } catch (Exception $exception) {
+            Db::rollback();
+            return json_show(CommonModel::$success, '微信支付预下单失败' . $exception->getMessage());
+        }
+
+
+    }
 
 }

app/mobile/logic/WechatLogic.php

@@ -34,4 +34,16 @@ class WechatLogic
     }
 
 
+    //通过code换取网页授权access_token(和openId)
+    public static function getOauthAccessToken()
+    {
+
+        $oauth = &load_wechat('Oauth');
+
+        $rs = $oauth->getOauthAccessToken();
+
+        halt('最终结果：', $rs);
+    }
+
+
 }

app/mobile/route/app.php

@@ -2,10 +2,14 @@
 
 use think\facade\Route;
 
+//【账户】
 Route::rule('login', 'Account/login');//登录
 Route::rule('logout', 'Account/logout');//登出
 Route::rule('info', 'Account/info');//账户详情
 Route::rule('updatePassword', 'Account/updatePassword');//修改密码
+Route::rule('bindAccountByCode', 'Account/bindAccountByCode');//通过微信端code绑定账户
+
+//【公共】
 Route::rule('video', 'Common/getVideoList');//视频列表
 Route::rule('area', 'Common/area');//省市区编码
 Route::rule('theme', 'Common/theme');//手机主题

app/model/CommonModel.php

@@ -38,4 +38,8 @@ class CommonModel
     public static $status_deliver = 1;
     public static $status_receipt = 2;
 
+    //购买的类型,1购买服务,2购买商城商品
+    public static $pay_type_service = 1;
+    public static $pay_type_shopping_good = 2;
+
 }