1

app/api/controller/Goods.php

@@ -13,6 +13,7 @@ declare (strict_types=1);
 namespace app\api\controller;
 
 use app\api\model\{Goods as GoodsModel, Store as StoreModel};
+use app\api\model\Region;
 use app\api\service\{Goods as GoodsService, User as UserService};
 use app\common\model\GoodsImage as GoodsImageModel;
 use app\common\model\UploadFile as UploadFileModel;
@@ -20,7 +21,7 @@ use app\common\service\qrcode\Goods as GoodsPoster;
 use cores\exception\BaseException;
 use think\db\exception\DbException;
 use think\response\Json;
-use app\api\model\Region;
+
 /**
  * 商品控制器
  * Class Goods
@@ -63,6 +64,7 @@ class Goods extends Controller
         }
         return $this->renderSuccess(['detail' => $goodsInfo]);
     }
+
     /**
      * 获取商品详情(详细信息)
      * @param int $goodsId 商品ID
@@ -135,6 +137,7 @@ class Goods extends Controller
 
         return $this->renderSuccess($return);
     }
+
     public function browseLog(): Json
     {
         $model = new GoodsModel;
@@ -189,12 +192,11 @@ class Goods extends Controller
         return $this->renderSuccess($list);
     }
 
-    public function presaleGoodsList()
+    public function presaleGoodsList(): Json
     {
         $param = $this->request->param();
         $model = new GoodsModel;
-        $list = $model->presaleGoodsList($param);
+        $list = $model->presaleGoodss($param);
-
         return $this->renderSuccess(compact('list'));
     }
 

app/api/controller/Wxserver.php

@@ -83,11 +83,11 @@ class Wxserver extends BaseController
                         } elseif ($data['MsgType'] == 'text' && !empty($data['Content'])) {
                             if ($data['Content'] == 'TESTCOMPONENT_MSG_TYPE_TEXT') {
                                 $data['Content'] = 'TESTCOMPONENT_MSG_TYPE_TEXT_callback';
-                                echo $this->responseText($data);
                             } elseif (strpos($data['Content'], 'QUERY_AUTH_CODE:') !== false) {
                                 $query_auth_code = trim(str_replace("QUERY_AUTH_CODE:", "", $data['Content']));
                                 $obj->apiText($query_auth_code, $data['FromUserName']);
                             }
+                            echo $this->responseText($data);
                         }
                     }
                 }
@@ -106,7 +106,7 @@ class Wxserver extends BaseController
              </xml>";
         $fromUser = $data['ToUserName'];
         $toUser = $data['FromUserName'];
-        $content = $data['Content'];
+        $content = !empty($data['Content']) ? $data['Content'] : 'success';
         $time = time();
         $msgType = 'text';
         return sprintf($template, $toUser, $fromUser, $time, $msgType, $content);

app/api/model/Goods.php

@@ -24,7 +24,6 @@ use app\common\model\Goods as GoodsModel;
 use app\common\model\GoodsCategoryRel as GoodsCategoryRelModel;
 use app\common\model\GoodsImage as GoodsImageModel;
 use app\common\model\UploadFile as UploadFileModel;
-use app\store\model\goods\GoodsPrice as GoodsPriceModel;
 use cores\exception\BaseException;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -45,8 +44,6 @@ class Goods extends GoodsModel
         'images',
         'delivery',
         'deduct_stock_type',
-        'sales_initial',
-        'sales_actual',
         'sort',
         'is_delete',
         'store_id',
@@ -232,6 +229,43 @@ class Goods extends GoodsModel
         return $info;
     }
 
+    public function presaleGoodss(array $param): array
+    {
+        $list = [];
+        $cate_goods_id = [];
+        if (!empty($param['category_id'])) {
+            $cate_model = new \app\store\model\GoodsCategoryRel();
+            $cate_goods_id = $cate_model
+                ->where(['category_id' => $param['category_id']])
+                ->column('goods_id');
+        }
+        $model = new PreSale();
+        $info = $model->where(['is_change' => 0, 'status' => 1])->field('goods_list,p_time')->find();
+        if (!$info->isEmpty()) {
+            $info = $info->toArray();
+            $goods_ids = explode(',', $info['goods_list']);
+            if ($cate_goods_id) {
+                $goods_ids = array_unique(array_values(array_intersect($cate_goods_id, $goods_ids)));
+            }
+            $result = $this->getListByIds($goods_ids);
+            if (!$result->isEmpty()) {
+                $result = $result->toArray();
+                foreach ($result as $v) {
+                    $list[] = [
+                        'goods_id' => $v['goods_id'],
+                        'goods_name' => $v['goods_name'],
+                        'goods_price_min' => $v['goods_price_min'],
+                        'sales_initial' => $v['sales_initial'],
+                        'sales_actual' => $v['sales_actual'],
+                        'image' => $v['goods_image'],
+                        'end_time' => strtotime($info['p_time']) - time()
+                    ];
+                }
+            }
+        }
+        return $list;
+    }
+
     public function presaleGoodsList()
     {
         $info = PreSale::where([
@@ -318,13 +352,15 @@ class Goods extends GoodsModel
 
         return $info;
     }
+
     /**
      * 商品主图、商品轮播图、商品详情处理
      * [dealGoodsImage description]
      * @param  [type] &$goodsInfo [description]
      * @return [type]             [description]
      */
-    public function dealGoodsImage(&$goodsInfo){
+    public function dealGoodsImage(&$goodsInfo)
+    {
         switch ($goodsInfo->channel) {
             case 'jd':
                 $jd = new \app\common\service\Jd();
@@ -364,6 +400,7 @@ class Goods extends GoodsModel
         }
 
     }
+
     /**
      * 获取商品详情 (详细数据用于页面展示)
      * @param int $goodsId 商品ID
@@ -709,7 +746,8 @@ class Goods extends GoodsModel
      * @throws DbException
      * @throws ModelNotFoundException
      */
-    public function editGoodsPrice($data) {
+    public function editGoodsPrice($data)
+    {
         if (empty($data['goods_price']) || empty($data['cost_price']) || empty($data['id'])) {
             $this->error = "请补全信息";
             return false;
@@ -747,7 +785,8 @@ class Goods extends GoodsModel
         return true;
     }
 
-    public function editGoodsSeckillPrice($data) {
+    public function editGoodsSeckillPrice($data)
+    {
         if (empty($data['seckill_price']) || empty($data['is_limit']) || empty($data['limit_times']) || empty($data['goods_id'])) {
             $this->error = "请补全信息";
             return false;

app/common/library/wxserver/Server.php

@@ -486,7 +486,7 @@ class Server
      * @notes:设置域名
      * @param $appid
      * @param $domain
-     * @return bool|void
+     * @return bool
      * @author: wanghousheng
      */
     public function setDomain($appid, $domain)
@@ -503,8 +503,8 @@ class Server
             if ($result && !empty($result['errmsg']) && $result['errmsg'] == 'ok') {
                 return true;
             }
-            return false;
         }
+        return false;
     }
 
     /**
@@ -606,14 +606,48 @@ class Server
                     $insert_data['create_time'] = time();
                     $model->insertGetId($insert_data);
                 }
+                $this->setOther($appid, $domain);
+            }
+        }
+    }
+
+    private function setOther($appid, $domain)
+    {
+        $up = [];
         //设置域名信息
-                $this->setDomain($appid, $domain);
+        if ($this->setDomain($appid, $domain)) {
+            $up['domain_status'] = 1;
+        }
         //设置隐私
-                $this->getPrivacySetting($appid);
+        if ($this->getPrivacySetting($appid)) {
+            $up['privacy_status'] = 1;
+        }
+        //设置业务域名
+        if ($this->modifyJumpDomain($appid)) {
+            $up['jump_domain_status'] = 1;
         }
+        if ($up) {
+            $model = new WxserverAccount();
+            $model->update($up, ['appid' => $appid]);
         }
     }
 
+    private function modifyJumpDomain($appid, $domain): bool
+    {
+        $token = $this->authorizerAccessToken($appid);
+        if ($token) {
+            $url = "https://api.weixin.qq.com/wxa/setwebviewdomain?access_token=$token";
+            $data['action'] = 'set';
+            $data['webviewdomain'] = $domain;
+            $result = $this->curlPost($url, json_encode($data));
+            $result = json_decode($result, true);
+            if ($result && !empty($result['errmsg']) && $result['errmsg'] == 'ok') {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * @notes:获取店铺ID
      * @param $appid