Merge branch 'colonel' into develop

application/modules/Job/controllers/Colonelorder.php

@@ -234,7 +234,7 @@ class ColonelorderController extends Job
         $res = Idgen::get(appConfig('idgen.partner'), appConfig('idgen.key'), [], $httpParams);
         $ids = $res['id_datetime']['goods'] ?? [];
         if ($count > count($ids)) {
-            throw new Exception('请求idgen服务失败，request:' . json_encode($httpParams) . ';response:' . json_encode($res));
+            throw new Exception('请求idgen服务失败，' . ['req' => $httpParams,'res' => $res]);
         }
         foreach ($data as $key => $item) {
             $data[$key]['pay_info_trade_id'] = $ids[$key];

application/modules/Job/controllers/Colonelwallet.php

@@ -16,6 +16,8 @@ class ColonelwalletController extends Job
     const CAPITAL_POOL_OP = 200; //200：团长奖励
     const WALLET_SERVICE_NAME = 10; // 10生活圈优惠券，11营销活动
     const WALLET_SOURCE_NAME = 1; //使用方名，1生活圈，2主端
+    const WALLET_ORDER_TYPE_USER  = 601; // 钱包-邀请新用户奖励类型
+    const WALLET_ORDER_TYPE_ORDER = 602; // 钱包-邀请下单奖励类型
 
     public $capitalPoolId = null;
 
@@ -72,13 +74,14 @@ class ColonelwalletController extends Job
         $httpParams = self::getWalletHttpParams();
         $list = [];
         foreach ($payInfoList as $payInfo) {
+            $thirdOrderInfo = self::getThirdOrderInfo($payInfo);
             $list[] = [
                 'user_id'             => $payInfo['colonel_user_id'],
                 'service_name'        => self::WALLET_SERVICE_NAME,
                 'source_name'         => self::WALLET_SOURCE_NAME,
                 'third_order_id'      => $payInfo['pay_info_trade_id'],
-                'third_order_id_type' => $payInfo['type'],
-                'third_order_desc'    => self::getThirdOrderDesc($payInfo),
+                'third_order_id_type' => $thirdOrderInfo['type'],
+                'third_order_desc'    => $thirdOrderInfo['desc'],
                 'amount'              => $payInfo['reward'],
                 'extra'               => ''
             ];
@@ -90,7 +93,7 @@ class ColonelwalletController extends Job
             $this->loggerInfo('调用钱包服务成功,count=' . count($payInfoList));
             return true;
         } else {
-            throw new Exception('调用钱包服务失败,httpParams=' . json_encode($httpParams));
+            throw new Exception('调用钱包服务失败,' . json_encode(['req' => $httpParams, 'res' => $response]));
         }
     }
 
@@ -113,13 +116,14 @@ class ColonelwalletController extends Job
         ];
         $body = [];
         foreach ($payInfoList as $payInfo) {
+            $thirdOrderInfo = self::getThirdOrderInfo($payInfo);
             $body[] = [
                 'op'                  => self::CAPITAL_POOL_OP,
                 'user_id'             => $payInfo['colonel_user_id'],
                 'amount'              => $payInfo['reward'],
                 'third_order_id'      => $payInfo['pay_info_trade_id'],
                 'third_order_id_type' => $payInfo['type'],
-                'third_order_desc'    => self::getThirdOrderDesc($payInfo),
+                'third_order_desc'    => $thirdOrderInfo['desc'],
             ];
         }
         $httpParams['body'] = $body;
@@ -129,7 +133,7 @@ class ColonelwalletController extends Job
             $this->loggerInfo('调用资金池服务成功,count=' . count($payInfoList));
             return true;
         } else {
-            throw new Exception('调用资金池服务失败,httpParams=' . json_encode($httpParams));
+            throw new Exception('调用资金池服务失败,' . ['req' => $httpParams,'res' => $res]);
         }
     }
 
@@ -178,17 +182,23 @@ class ColonelwalletController extends Job
      * User: pengfei@yidian-inc.com
      * Date: 2021/9/3 6:10 下午
      * @param $payInfo
-     * @return string
+     * @return array
      */
-    private function getThirdOrderDesc($payInfo): string
+    private function getThirdOrderInfo($payInfo): array
     {
-        $desc = '';
+        $info = [];
         if ($payInfo['type'] == ColonelDistributorPayInfo::TYPE_NEW_USER) {
-            $desc = "邀请新用户（" . $payInfo["invite_user_nick"] . "）完成下单奖励";
+            $info = [
+                'desc' => "邀请新用户（" . $payInfo["invite_user_nick"] . "）完成下单奖励",
+                'type' => self::WALLET_ORDER_TYPE_USER,
+            ];
         } elseif ($payInfo['type'] == ColonelDistributorPayInfo::TYPE_FINISH_TARGET) {
-            $desc = "完成" . $payInfo["finish_num"] . "单用户下单奖励";
+            $info = [
+                'desc' => "完成" . $payInfo["finish_num"] . "单用户下单奖励",
+                'type' => self::WALLET_ORDER_TYPE_ORDER,
+            ];
         }
-        return $desc;
+        return $info;
     }
 
 
@@ -207,7 +217,7 @@ class ColonelwalletController extends Job
             ['pay_info_id' => $payInfoIds]
         );
         if (empty($upStatus)) {
-            throw new Exception('更新pay_info状态失败.pay_info_ids=' . implode(',',$payInfoIds));
+            throw new Exception('更新pay_info状态失败.pay_info_ids=' . implode(',', $payInfoIds));
         }
         return $upStatus;
     }

application/services/goods/GoodsService.php

@@ -272,7 +272,9 @@ class GoodsService
                 $skuParams['online_status'] = 0;
                 break;
             default:
-                # code...
+                $skuParams['online_type'] = 1;
+                $skuParams['online_status'] = 0;
+                $skuParams['online_start_time'] = date("Y-m-d H:i:s");
                 break;
         }
 

application/services/user/UserService.php

@@ -26,7 +26,6 @@ class UserService
 
     public static function wechatLogin($params)
     {
-
         $code = !empty($params['code']) ? $params['code'] : '';//小程序授权code
         $openid = !empty($params['openid']) ? $params['openid'] : '';//小程序授权code
         if (empty($code) && empty($openid)) {
@@ -34,6 +33,21 @@ class UserService
             throw new UserException(['cus' => 0]);
         }
 
+        $redis = RedisUtil::getInstance('cache');
+        $key = "wx_wechat_login_".$code;
+        $keyCode = "wx_wechat_login_code_".$code;
+        $lock = FrequencyLockUtil::isLocked($key,1,120);
+        if ($lock) {
+            sleep(1);
+            $user = $redis->get($keyCode);
+            if (!empty($user)) {
+                $user = json_decode($user,true);
+            }
+            FileLog::error("wechatLogin: lock", json_encode($user, JSON_UNESCAPED_UNICODE),'','jianghaiming@yidian-inc.com');
+            FileLog::error("wechatLogin: lock--params", json_encode($params, JSON_UNESCAPED_UNICODE),'','jianghaiming@yidian-inc.com');
+            return $user;
+        }
+
         //需要授权微信
         //if (empty($openid)) {
         $appid = \Yaf\Registry::get('config')->wechat->appid;
@@ -107,8 +121,9 @@ class UserService
             ];
             $newWechatId = UserWechatBind::save($insert, ['openid' => $openid]);
         }
-
         $user['third_session'] = self::generate3rdSession($openid);
+
+        $redis->set($keyCode, json_encode($user),120);
         return $user;
     }
 

conf/cli.ini

@@ -11,7 +11,11 @@ idgen.partner = "bp"
 idgen.key = "5cfdb867e96374c7883b31d6928cc4cb"
 
 [prod : common]
+colonel.wallet.transfer_service_id="21090614423333205002"
+colonel.wallet.transfer_service_secret="4916927cf3305292f5a524db592dfa95"
 [perf : common ]
+colonel.wallet.transfer_service_id="21090614423333205002"
+colonel.wallet.transfer_service_secret="4916927cf3305292f5a524db592dfa95"
 [test: common ]
 colonel.wallet.transfer_service_id="21090614423333205002"
 colonel.wallet.transfer_service_secret="4916927cf3305292f5a524db592dfa95"