Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/ClearController.php

@@ -4,7 +4,7 @@ namespace ghs\controllers;
 
 use bizGhs\clear\classes\ClearClass;
 use bizGhs\clear\services\ClearService;
-use common\components\stringUtil;
+use bizGhs\custom\classes\CustomClass;
 use common\components\util;
 use Yii;
 
@@ -15,11 +15,11 @@ class ClearController extends BaseController
     public function actionList()
     {
         $get = Yii::$app->request->get();
-        $where = ['sjId' => $this->sjId, 'shopId' => $this->shopId];
-        if (isset($get['customId'])) {
-            $where['customId'] = $get['customId'];
-        }
         $where['status'] = 2;
+        $customId = $get['customId'] ?? 0;
+        $custom = CustomClass::getById($customId, true);
+        CustomClass::valid($custom, $this->shopId);
+        $where['customId'] = $customId;
         $list = ClearService::getClearList($where);
         util::success($list);
     }
@@ -28,7 +28,7 @@ class ClearController extends BaseController
     public function actionGetFullInfo()
     {
         $id = Yii::$app->request->get('id');
-        $respond = ClearClass::getFullInfo($id);
+        $respond = ClearClass::getSaleInfo($id);
         util::success($respond);
     }
 

app-ghs/controllers/MapController.php

@@ -10,6 +10,7 @@ class MapController extends BaseController
 {
 
     public $guestAccess = ['suggestion'];
+
     //腾讯地图关键词输入提醒 ssh 2020.1.21
     public function actionSuggestion()
     {
@@ -19,4 +20,23 @@ class MapController extends BaseController
         util::success($result);
     }
 
+    //解析地址 shish 20210626
+    public function actionResolve()
+    {
+        $lat = Yii::$app->request->get('lat');
+        $long = Yii::$app->request->get('long');
+        if (empty($lat) || empty($long)) {
+            util::success([]);
+        }
+        $res = mapUtil::resolveLocation($lat, $long);
+        $address = $res['result']['formatted_addresses']['recommend'] ?? '';
+        $province = $res['result']['address_component']['province'] ?? '';
+        $city = $res['result']['address_component']['city'] ?? '';
+        $showAddress = $res['result']['address'] ?? '';
+        if (empty($address) || empty($province) || empty($city)) {
+            util::success([]);
+        }
+        util::success(['province' => $province, 'city' => $city, 'address' => $address, 'showAddress' => $showAddress]);
+    }
+
 }

app-hd/controllers/ClearController.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace hd\controllers;
+
+use biz\ghs\classes\GhsClass;
+use bizGhs\clear\classes\ClearClass;
+use bizGhs\clear\services\ClearService;
+use common\components\util;
+use Yii;
+
+class ClearController extends BaseController
+{
+
+    //结款单 shish 20210625
+    public function actionList()
+    {
+        $get = Yii::$app->request->get();
+        $where['status'] = 2;
+        $ghsId = $get['ghsId'] ?? 0;
+        $ghs = GhsClass::getById($ghsId, true);
+        GhsClass::valid($ghs, $this->shopId);
+        $where['ghsId'] = $ghsId;
+        $list = ClearService::getClearList($where);
+        util::success($list);
+    }
+
+    //获取基本信息 shish 20210625
+    public function actionGetFullInfo()
+    {
+        $id = Yii::$app->request->get('id');
+        $respond = ClearClass::getCgInfo($id);
+        util::success($respond);
+    }
+
+}

app-hd/controllers/MapController.php

@@ -8,16 +8,35 @@ use Yii;
 
 class MapController extends BaseController
 {
-	
-	public $guestAccess = ['suggestion'];
-	
-	//腾讯地图关键词输入提醒 ssh 2020.1.21
-	public function actionSuggestion()
-	{
-		$region = Yii::$app->request->get('region', '厦门市');
-		$keyword = Yii::$app->request->get('keyword', '金尚小区');
-		$result = mapUtil::suggestion($region, $keyword);
-		util::success($result);
-	}
-	
+
+    public $guestAccess = ['suggestion'];
+
+    //腾讯地图关键词输入提醒 ssh 2020.1.21
+    public function actionSuggestion()
+    {
+        $region = Yii::$app->request->get('region', '厦门市');
+        $keyword = Yii::$app->request->get('keyword', '金尚小区');
+        $result = mapUtil::suggestion($region, $keyword);
+        util::success($result);
+    }
+
+    //解析地址 shish 20210626
+    public function actionResolve()
+    {
+        $lat = Yii::$app->request->get('lat');
+        $long = Yii::$app->request->get('long');
+        if (empty($lat) || empty($long)) {
+            util::success([]);
+        }
+        $res = mapUtil::resolveLocation($lat, $long);
+        $address = $res['result']['formatted_addresses']['recommend'] ?? '';
+        $province = $res['result']['address_component']['province'] ?? '';
+        $city = $res['result']['address_component']['city'] ?? '';
+        $showAddress = $res['result']['address'] ?? '';
+        if (empty($address) || empty($province) || empty($city)) {
+            util::success([]);
+        }
+        util::success(['province' => $province, 'city' => $city, 'address' => $address, 'showAddress' => $showAddress]);
+    }
+
 }

app-pt/controllers/MapController.php

@@ -18,4 +18,23 @@ class MapController extends BaseController
         util::success($result);
     }
 
+    //解析地址 shish 20210626
+    public function actionResolve()
+    {
+        $lat = Yii::$app->request->get('lat');
+        $long = Yii::$app->request->get('long');
+        if (empty($lat) || empty($long)) {
+            util::success([]);
+        }
+        $res = mapUtil::resolveLocation($lat, $long);
+        $address = $res['result']['formatted_addresses']['recommend'] ?? '';
+        $province = $res['result']['address_component']['province'] ?? '';
+        $city = $res['result']['address_component']['city'] ?? '';
+        $showAddress = $res['result']['address'] ?? '';
+        if (empty($address) || empty($province) || empty($city)) {
+            util::success([]);
+        }
+        util::success(['province' => $province, 'city' => $city, 'address' => $address, 'showAddress' => $showAddress]);
+    }
+
 }

app-pt/controllers/ShopController.php

@@ -3,17 +3,22 @@
 namespace pt\controllers;
 
 use bizHd\merchant\services\ShopService;
+use common\components\mapUtil;
 use common\components\util;
 use Yii;
 
 class ShopController extends BaseController
 {
-	
-	public function actionList()
-	{
-		$where = [];
-		$list = ShopService::getShopList($where);
-		util::success($list);
-	}
+
+    public function actionList()
+    {
+
+        $res = mapUtil::resolveLocation('39.984154', '116.307490');
+echo '<pre>';print_r($res);die;
+
+        $where = [];
+        $list = ShopService::getShopList($where);
+        util::success($list);
+    }
 
 }

biz-ghs/clear/classes/ClearClass.php

@@ -8,6 +8,7 @@ use bizGhs\base\classes\BaseClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\order\classes\OrderClass;
 use bizGhs\order\classes\PurchaseOrderClass;
+use bizHd\purchase\classes\PurchaseClass;
 use common\components\dict;
 use common\components\orderSn;
 use common\components\util;
@@ -146,7 +147,7 @@ class ClearClass extends BaseClass
     }
 
     //完整信息 shish 20210625
-    public static function getFullInfo($id)
+    public static function getSaleInfo($id)
     {
         $info = self::getById($id);
         if (empty($info)) {
@@ -162,4 +163,21 @@ class ClearClass extends BaseClass
         return $info;
     }
 
+    //完整信息 shish 20210625
+    public static function getCgInfo($id)
+    {
+        $info = self::getById($id);
+        if (empty($info)) {
+            return $info;
+        }
+        $purchaseIds = $info['purchaseIds'] ?? [];
+        $cgArr = explode(',', $purchaseIds);
+        $cgList = PurchaseClass::getAllByCondition(['id' => ['in', $cgArr]], null, 'id,orderSn,bigNum,smallNum,realPrice', null);
+        $info['orderList'] = $cgList;
+        $info['orderNum'] = count($cgArr);
+        $type = $info['type'] ?? 1;
+        $info['operator'] = $type == 2 ? '商家' : '';
+        return $info;
+    }
+
 }

biz-ghs/order/classes/OrderClass.php

@@ -405,6 +405,7 @@ class OrderClass extends BaseClass
                 }
             }
 
+            $sendNum = $val['sendNum'] ?? '';
             $printData = [
                 'address' => '集美区乐海路186-4',
                 'sendCost' => $val['sendCost'] ?? '0.00',
@@ -421,6 +422,7 @@ class OrderClass extends BaseClass
                     'fullAddress' => $val['fullAddress'] ?? '',
                 ],
                 'product' => $printProduct,
+                'sendNum' => date("d") . $sendNum,
             ];
             $list[$key]['printData'] = json_encode($printData);
         }

biz-hd/purchase/services/PurchaseService.php

@@ -59,6 +59,7 @@ class PurchaseService extends BaseService
         $couponId = $data['couponId'] ?? 0;
         $discountType = $respond->discountType ?? dict::getDict('discountType', 'noDiscount');
         $discountAmount = $respond->discountAmount ?? 0;
+        $remark = $data['remark'] ?? '';
         $arr = [
             'product' => $product,
             'sjId' => $currentSjId,
@@ -84,6 +85,7 @@ class PurchaseService extends BaseService
             'couponId' => $couponId,
             'discountType' => $discountType,
             'discountAmount' => $discountAmount,
+            'remark' => $remark,
         ];
         $result = OrderClass::addOrder($arr);
         $saleId = $result['id'] ?? 0;

biz-hd/saas/services/ApplyService.php

@@ -151,6 +151,11 @@ class ApplyService extends BaseService
             \biz\admin\classes\AdminClass::updateById($adminId, ['openShop' => 2]);
         }
 
+        $id = $respond['id'] ?? 0;
+        if (!empty($id)) {
+            ApplyService::pass($id);
+        }
+
         return $respond;
     }
 

common/components/mapUtil.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * User: ssh
+ * User: shish
  * Date: 2019/11/20
  * Time: 23:21
  */
@@ -12,32 +12,42 @@ use yii\helpers\Json;
 
 class mapUtil
 {
-	
-	public static $txMapKey = 'OFWBZ-2NTHP-EHNDD-LKWQY-GANM7-PXBJH';
-	
-	//腾讯地图关键词输入提醒 ssh 2020.1.21
-	//https://lbs.qq.com/webservice_v1/guide-suggestion.html
-	public static function suggestion($region, $keyword)
-	{
-		$url = "http://apis.map.qq.com/ws/place/v1/suggestion/?region={$region}&keyword={$keyword}&key=" . self::$txMapKey;
-		$curl = new curl\Curl();
-		$result = $curl->get($url);
-		$result = Json::decode($result);
-		return $result;
-	}
-	
-	//计算距离 lng经度 lat纬度 ssh 2020.5.14
-	public static function calculateDistance($fromLnt, $fromLat, $toLnt, $toLat)
-	{
-		$url = "https://apis.map.qq.com/ws/distance/v1/?mode=driving&from={$fromLat},{$fromLnt}&to={$toLat},{$toLnt}&key=" . self::$txMapKey;
-		$curl = new curl\Curl();
-		$result = $curl->get($url);
-		$result = Json::decode($result);
-		$distance = 0;
-		if (isset($result['status']) && $result['status'] == 0) {
-			$distance = isset($result['result']['elements'][0]['distance']) ? $result['result']['elements'][0]['distance'] : 0;
-		}
-		return $distance;
-	}
+
+    public static $txMapKey = 'OFWBZ-2NTHP-EHNDD-LKWQY-GANM7-PXBJH';
+
+    //腾讯地图关键词输入提醒 ssh 2020.1.21
+    //https://lbs.qq.com/webservice_v1/guide-suggestion.html
+    public static function suggestion($region, $keyword)
+    {
+        $url = "http://apis.map.qq.com/ws/place/v1/suggestion/?region={$region}&keyword={$keyword}&key=" . self::$txMapKey;
+        $curl = new curl\Curl();
+        $result = $curl->get($url);
+        $result = Json::decode($result);
+        return $result;
+    }
+
+    //计算距离 lng经度 lat纬度 ssh 2020.5.14
+    public static function calculateDistance($fromLnt, $fromLat, $toLnt, $toLat)
+    {
+        $url = "https://apis.map.qq.com/ws/distance/v1/?mode=driving&from={$fromLat},{$fromLnt}&to={$toLat},{$toLnt}&key=" . self::$txMapKey;
+        $curl = new curl\Curl();
+        $result = $curl->get($url);
+        $result = Json::decode($result);
+        $distance = 0;
+        if (isset($result['status']) && $result['status'] == 0) {
+            $distance = isset($result['result']['elements'][0]['distance']) ? $result['result']['elements'][0]['distance'] : 0;
+        }
+        return $distance;
+    }
+
+    //逆地址解析，根据经纬度解析出中文地址 shish
+    public static function resolveLocation($lat, $long)
+    {
+        $url = "https://apis.map.qq.com/ws/geocoder/v1/?location={$lat},{$long}&get_poi=0&key=" . self::$txMapKey;
+        $curl = new curl\Curl();
+        $result = $curl->get($url);
+        $result = Json::decode($result);
+        return $result;
+    }
 
 }