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

# Conflicts:
#	sql.sql

app-ghs/controllers/ShopAdminController.php

@@ -3,16 +3,12 @@
 namespace ghs\controllers;
 
 use bizHd\wx\classes\WxOpenClass;
-use bizGhs\admin\classes\AdminClass;
 use bizGhs\shop\classes\ShopAdminClass;
 use bizGhs\admin\services\AdminRoleService;
 use bizGhs\shop\services\ShopAdminService;
-use bizHd\wx\services\WxOpenService;
 use common\components\imgUtil;
-use common\components\jwt;
 use common\components\util;
 use Yii;
-use yii\web\Controller;
 
 class ShopAdminController extends BaseController
 {
@@ -57,7 +53,7 @@ class ShopAdminController extends BaseController
         if (empty($relation)) {
             util::fail('没有找到员工');
         }
-        ShopAdminClass::valid($relation->attributes, $this->sjId);
+        ShopAdminClass::valid($relation->attributes, $this->shopId);
         $relation->remind = $remind;
         $relation->save();
         util::complete();
@@ -73,7 +69,7 @@ class ShopAdminController extends BaseController
         if (empty($relation)) {
             util::fail('没有找到员工');
         }
-        ShopAdminClass::valid($relation->attributes, $this->sjId);
+        ShopAdminClass::valid($relation->attributes, $this->shopId);
         $relation->status = $status;
         $relation->save();
         util::complete();
@@ -131,7 +127,7 @@ class ShopAdminController extends BaseController
         if ($relation['super'] == 1) {
             //util::fail("管理员不能删除");
         }
-        ShopAdminClass::valid($relation, $this->sjId);
+        ShopAdminClass::valid($relation, $this->shopId);
         ShopAdminClass::delRelation($relation);
         util::complete();
     }

app-hd/controllers/BaseController.php

@@ -75,10 +75,11 @@ class BaseController extends PublicController
         } else {
             //后台
             $currentShopId = $admin['currentShopId'] ?? 0;
-            if (in_array($action->id, $this->guestAccessAction) == false) {
-                if (empty($currentShopId)) {
+            if (empty($currentShopId)) {
+                if (in_array($action->id, $this->guestAccessAction) == false) {
                     util::fail('您不是员工没有权限访问');
                 }
+            } else {
                 $this->shopId = $currentShopId;
                 $shop = ShopService::getById($currentShopId);
                 $this->shop = $shop;
@@ -99,6 +100,7 @@ class BaseController extends PublicController
                 $this->sjExtend = $sjExtend;
             }
         }
+
         return parent::beforeAction($action);
     }
 

app-hd/controllers/OrderController.php

@@ -27,662 +27,662 @@ use common\components\httpUtil;
 
 class OrderController extends BaseController
 {
-	
-	public $guestAccessAction = ['order-relate', 'fast-pay', 'create-order', 'list'];
-	
-	//商城下单操作 ssh 2019.12.3
-	public function actionCreateOrder()
-	{
-		$post = Yii::$app->request->post();
-		$needSend = isset($post['needSend']) && is_numeric($post['needSend']) ? $post['needSend'] : 1;
-		$orderType = $post['orderType'] ?? 1;
-		
-		$defaultShopId = MerchantService::getDefaultShopId($this->sj);
-		if (empty($defaultShopId)) {
-			util::fail('没有找到门店');
-		}
-		$post['merchantId'] = $this->sjId;
-		$post['shopId'] = $defaultShopId;
-		$post['payWay'] = $this->isWx == true ? 0 : 1;
-		$now = time();
-		$expireTime = $now + 1800;//订单30分钟后过期
-		$post['deadline'] = $expireTime;
-		$post['fromType'] = 1;//商城
-		$customId = $post['customId'] ?? 0;
-		if (!empty($customId)) {
-			$customId = $this->customId;
-		}
-		$post['customId'] = $customId;
-		//非门店订单
-		$store = 0;
-		$post['store'] = $store;
-		
-		$couponId = isset($post['couponId']) && !empty($post['couponId']) ? $post['couponId'] : 0;
-		
-		//$orderType = 1 成品订单
-		if ($orderType == 1) {
-			
-			$goodsInfo = $post['goodsInfo'] ?? '';
-			$goodsInfoArr = json_decode($goodsInfo, true);
-			if (empty($goodsInfoArr)) {
-				util::fail('请选择商品');
-			}
-			//总的商品金额
-			$totalGoodsPrice = 0;
-			$orderGoods = [];
-			foreach ($goodsInfoArr as $key => $currentGoods) {
-				$currentGoodsId = $currentGoods['goodsId'];
-				$currentGoodsInfo = GoodsService::getGoodsInfo($currentGoodsId);
-				if (empty($currentGoodsInfo)) {
-					util::fail('没有找到商品');
-				}
-				$goodsStyleId = $currentGoods['goodsStyleId'];
-				$goodsNum = $currentGoods['goodsNum'];
-				//计算总金额
-				$unitPrice = $currentGoodsInfo['price'];
-				$goodsStyleList = isset($currentGoodsInfo['goodsStyleList']) ? $currentGoodsInfo['goodsStyleList'] : [];
-				if (!empty($goodsStyleId)) {
-					if (empty($goodsStyleList)) {
-						util::fail('商品款式没有找到');
-					}
-					$styleIdList = array_keys($goodsStyleList);
-					if (in_array($goodsStyleId, $styleIdList) == false) {
-						util::fail('商品款式没有找到！');
-					}
-					$unitPrice = isset($goodsStyleList[$goodsStyleId]['price']) ? $goodsStyleList[$goodsStyleId]['price'] : 9999;
-				}
-				$goodsPrice = $unitPrice * $goodsNum;
-				$totalGoodsPrice = stringUtil::calcAdd($totalGoodsPrice, $goodsPrice);
-				
-				$orderGoods[] = [
-					'goodsId' => $currentGoodsId,
-					'userId' => $this->adminId,
-					'merchantId' => $this->sjId,
-					'title' => $currentGoodsInfo['goodsName'],
-					'cover' => isset($goodsInfo['shortImgList']) && !empty($currentGoodsInfo['shortImgList']) ? current($currentGoodsInfo['shortImgList']) : '',
-					'unitPrice' => $unitPrice,
-					'num' => $goodsNum,
-					'goodsStyleName' => isset($currentGoodsInfo['goodsStyleList'][$goodsStyleId]['title']) ? $currentGoodsInfo['goodsStyleList'][$goodsStyleId]['title'] : '',
-					'goodsStyleId' => $goodsStyleId,
-					'createTime' => date("Y-m-d H:i:s"),
-				];
-				
-			}
-			
-			$user = $this->custom;
-			$post['bookName'] = isset($user['name']) ? $user['name'] : '';
-			$bookMobile = isset($post['bookMobile']) && !empty($post['bookMobile']) && stringUtil::isMobile($post['bookMobile']) ? $post['bookMobile'] : '';
-			$bookMobile = empty($bookMobile) && isset($user['mobile']) && !empty($user['mobile']) ? $user['mobile'] : $bookMobile;
-			$post['bookMobile'] = $bookMobile;
-			
-			//计算运费
-			$post['sendDistance'] = isset($post['sendDistance']) ? $post['sendDistance'] : 0;
-			$sendCost = 0;
-			//按距离计算运费并且客户要求送的
-			//运费计算方式
-			$freightType = 0;
-			if ($freightType == 0 && $needSend == 1) {
-				$lat = $post['latitude'];//收货人纬度
-				$lng = $post['longitude'];//收货人经度
-				$respond = ExpressService::getUserDistance($lng, $lat, $defaultShopId, $this->sjExtend);
-				$sendCost = isset($respond['fee']) ? $respond['fee'] : 0;
-			}
-			$post['sendCost'] = $sendCost;
-			
-			$prePrice = stringUtil::calcAdd($sendCost, $totalGoodsPrice);
-			
-			//来源 0微信 1支付宝 2小程序 3朋友圈 4美团
-			$sourceType = $this->isWx ? 0 : 1;
-			if (httpUtil::isMiniProgram()) {
-				$sourceType = 2;
-			}
-			$discountData = OrderService::getDiscountPrice(['price' => $prePrice, 'sourceType' => $sourceType, 'couponId' => $couponId, 'userId' => $this->adminId]);
-			$actPrice = $discountData['price'];
-			$post['discountType'] = $discountData['discountType'];
-			$post['discountAmount'] = $discountData['discountAmount'];
-			$post['prePrice'] = $prePrice;
-			$post['actPrice'] = $actPrice;
-			$order = OrderClass::addOrder($post);
-			$orderId = $order['id'];
-			$orderSn = $order['orderSn'];
-			
-			foreach ($orderGoods as $key => $val) {
-				$val['orderId'] = $orderId;
-				$val['orderSn'] = $orderSn;
-				OrderGoodsService::add($val);//创建订单商品列表
-			}
-		} else {
-			//$orderType = 2 花材订单
-			
-			$productData = $post['product'] ?? '';
-			$product = json_decode($productData, true);
-			if (empty($product)) {
-				util::fail('请选择花材');
-			}
-			$actPrice = 0;
-			$orderProduct = [];
-			foreach ($product as $key => $val) {
-				$productId = $val['productId'];
-				$bigNum = $val['bigNum'];
-				$smallNum = $val['smallNum'];
-				$actPrice += 2;
-				$orderProduct[] = [
-					'productId' => $productId,
-					'bigNum' => $bigNum,
-					'smallNum' => $smallNum,
-				];
-			}
-			
-			$post['prePrice'] = $actPrice;
-			$post['actPrice'] = $actPrice;
-			$order = OrderClass::addOrder($post);
-			$orderId = $order['id'];
-			$orderSn = $order['orderSn'];
-			
-			foreach ($orderProduct as $key => $val) {
-				$val['orderSn'] = $orderSn;
-				OrderItemClass::add($val);
-			}
-			
-		}
-		util::success(['orderSn' => $orderSn, 'totalPrice' => $actPrice, 'couponId' => $couponId, 'orderId' => $orderId]);
-	}
-	
-	//下单要用到的相关信息 ssh 2019.12.6
-	public function actionOrderRelate()
-	{
-		$regionTree = RegionService::tree();
-		$shop = ShopService::getDefaultShop($this->sj);
-		$freight = MerchantExtendService::getFreight($this->sjExtend);
-		$mapKey = 'OFWBZ-2NTHP-EHNDD-LKWQY-GANM7-PXBJH';
-		$out = ['freight' => $freight, 'shop' => $shop, 'region' => $regionTree, 'txMapKey' => $mapKey, 'merchant' => $this->sj];
-		util::success($out);
-	}
-	
-	//余额支付 ssh 2019.12.6
-	public function actionBalancePay()
-	{
-		$post = Yii::$app->request->post();
-		$orderSn = isset($post['orderSn']) ? $post['orderSn'] : 0;
-		$payPassword = isset($post['payPassword']) ? $post['payPassword'] : 0;
-		$couponId = isset($post['couponId']) ? $post['couponId'] : 0;
-		
-		//验证优惠券是否还有效
-		if (!empty($couponId)) {
-			CouponService::checkBeforeUse($couponId, $order['prePrice'], $order['userId']);
-		}
-		
-		$order = OrderService::getByOrderSn($orderSn);
-		$userId = $this->adminId;
-		$user = UserService::getUserInfo($userId, false);
-		//验证支付密码是否正确
-		UserService::validPayPassword($payPassword, $user);
-		//支付前验证订单有效性
-		OrderService::checkBeforePay($order, $this->adminId);
-		$typeList = dict::getConfig('capitalType');
-		$capitalType = $typeList['xhOrder']['id'];
-		$totalFee = $order['prePrice'];
-		$sourceType = 0;
-		$discountData = OrderService::getDiscountPrice(['price' => $totalFee, 'sourceType' => $sourceType, 'couponId' => $couponId, 'userId' => $this->adminId]);
-		$actPrice = $discountData['price'];
-		$callbackParams = [];
-		$respond = xhPayToolService::balancePay($callbackParams, $orderSn, $actPrice, $capitalType, $couponId);
-		$balance = isset($respond['balance']) ? $respond['balance'] : 0;
-		util::success(['discountAmount' => $discountData['discountAmount'], 'discountType' => $discountData['discountType'], 'balance' => $balance]);
-	}
-	
-	//获取商城下单要用的微信支付和小程序支付参数 ssh 2019.21.3
-	public function actionWxPay()
-	{
-		ini_set('date.timezone', 'Asia/Shanghai');
-		$post = Yii::$app->request->post();
-		$couponId = isset($post['couponId']) ? $post['couponId'] : 0;
-		$orderSn = isset($post['orderSn']) ? $post['orderSn'] : 0;
-		$order = OrderService::getByOrderSn($orderSn);
-		$orderId = $order['id'];
-		
-		//验证优惠券是否还有效
-		if (!empty($couponId)) {
-			CouponService::checkBeforeUse($couponId, $order['prePrice'], $order['userId']);
-		}
-		
-		//支付前验证订单有效性
-		OrderService::checkBeforePay($order, $this->adminId);
-		
-		$name = isset($order['orderName']) && !empty($order['orderName']) ? $order['orderName'] : '购买商品';
-		$totalFee = $order['actPrice'];
-		
-		//小程序使用miniOpenId
-		if (httpUtil::isMiniProgram()) {
-			$openId = $this->user['miniOpenId'];
-		} else {
-			$openId = $this->user['openId'];
-		}
-		$typeList = dict::getConfig('capitalType');
-		$capitalType = $typeList['xhOrder']['id'];
-		//流水类型、优惠卷、微信支付（h5还是小程序支付）类型 带到回调
-		$wxPayType = 0;
-		if (httpUtil::isMiniProgram()) {
-			$wxPayType = 1;
-		}
-		$attach = "couponId=" . $couponId . "&capitalType=" . $capitalType . '&wxPayType=' . $wxPayType;
-		//订单30分钟后过期
-		$now = time();
-		$expireTime = $now + 1800;
-		
-		$wx = Yii::getAlias("@vendor/weixin");
-		require_once($wx . '/lib/WxPay.Api.php');
-		require_once($wx . '/example/WxPay.JsApiPay.php');
-		$input = new \WxPayUnifiedOrder();
-		$input->SetBody($name);
-		$input->SetOut_trade_no($orderSn);
-		$input->SetTotal_fee($totalFee * 100);
-		$input->SetTime_start(date("YmdHis", $now));
-		$input->SetAttach($attach);//将流水类型、代金劵等传给微信再回传
-		$input->SetTime_expire(date("YmdHis", $expireTime));
-		$input->SetNotify_url(Yii::$app->params['mallHost'] . '/notice/wx-callback/');
-		$input->SetTrade_type("JSAPI");
-		
-		//花卉宝代为申请的微信支付
-		$merchantExtend = $this->sjExtend;
-		if (isset($merchantExtend['wxPayApply']) && $merchantExtend['wxPayApply'] == 1) {
-			$input->SetSub_openid($openId);
-		} else {
-			$input->SetOpenid($openId);
-		}
-		//小程序使用miniAppId
-		if (httpUtil::isMiniProgram()) {
-			$merchantExtend['wxAppId'] = $merchantExtend['miniAppId'];
-		}
-		
-		$wxOrder = \WxPayApi::unifiedOrder($input, 6, $merchantExtend);
-		$tools = new \JsApiPay();
-		$jsApiParameters = $tools->GetJsApiParameters($wxOrder, $merchantExtend);
-		$newParams = json_decode($jsApiParameters, true);
-		//已请求微信不能修改价格
-		$updateData = [];
-		$updateData['modPrice'] = 0;
-		if (empty($order['deadline'])) {
-			$updateData['deadline'] = $expireTime;
-		}
-		OrderService::updateById($orderId, $updateData);
-		util::success($newParams);
-	}
-	
-	//快捷付款订单
-	public function actionFastPay()
-	{
-		ini_set('date.timezone', 'Asia/Shanghai');
-		$post = Yii::$app->request->post();
-		$payWay = isset($post['payWay']) ? $post['payWay'] : 0;
-		$shopId = !empty($this->shopId) ? $this->shopId : ShopService::getDefaultShopId($this->sj);
-		//验证门店是否有效
-		$shopInfo = ShopService::getById($shopId);
-		ShopService::valid($shopInfo, $this->sjId);
-		$post['shopId'] = $shopId;
-		//默认门店订单
-		$store = isset($post['store']) ? $post['store'] : 1;
-		$post['store'] = $store;
-		//来源 0微信 1支付宝 2小程序 3朋友圈 4美团
-		$sourceType = $this->isWx ? 0 : 1;
-		if (httpUtil::isMiniProgram()) {
-			$sourceType = 2;
-		}
-		$sourceType = isset($post['sourceType']) ? $post['sourceType'] : 0;
-		//兼容旧系统sourceType=3表示朋友圈来源
-		$fromType = $sourceType == 3 ? 2 : 0;
-		$fromType = isset($post['fromType']) && !empty($post['fromType']) ? $post['fromType'] : $fromType;
-		$post['userId'] = $this->adminId;
-		$custom = $this->custom;
-		$post['bookName'] = $custom['userName'] ?? '';
-		$bookMobile = isset($post['bookMobile']) && !empty($post['bookMobile']) && stringUtil::isMobile($post['bookMobile']) ? $post['bookMobile'] : '';
-		$bookMobile = empty($bookMobile) && isset($custom['mobile']) && !empty($custom['mobile']) ? $custom['mobile'] : $bookMobile;
-		$post['bookMobile'] = $bookMobile;
-		$prePrice = round($post['prePrice'], 2);
-		$couponId = isset($post['couponId']) ? $post['couponId'] : 0;
-		$discountData = OrderService::getDiscountPrice(['price' => $prePrice, 'sourceType' => $sourceType, 'couponId' => $couponId, 'userId' => $this->adminId]);
-		$actPrice = $discountData['price'];
-		$post['discountType'] = $discountData['discountType'];
-		$post['discountAmount'] = $discountData['discountAmount'];
-		$post['actPrice'] = $actPrice;
-		$post['payStyle'] = 0;
-		$post['merchantId'] = $this->sjId;
-		$now = time();
-		$expireTime = $now + 300;//订单5分钟后过期
-		$post['createTime'] = date("Y-m-d H:i:s", $now);
-		$post['deadline'] = $expireTime;
-		if ($actPrice <= 0) {
-			util::fail('请填写正确的金额');
-		}
-		//微信支付订单提交不能修改价格
-		$post['modPrice'] = $this->isWx ? 0 : 1;
-		$post['sourceType'] = $sourceType;
-		$post['goodsNum'] = 1;
-		$post['fromType'] = $fromType;
-		$order = OrderService::addOrder($post);
-		$orderId = $order['id'];
-		$orderSn = $order['orderSn'];
-		$merchantId = $this->sjId;
-		if ($payWay == 0) {
-			$orderId = $order['id'];
-			$name = '购买商品';
-			$totalFee = $actPrice;
-			$user = UserService::getById($this->adminId);
-			$openId = isset($user['openId']) ? $user['openId'] : 0;
-			if (httpUtil::isMiniProgram()) {
-				//小程序使用miniOpenId
-				$openId = $user['miniOpenId'];
-			}
-			if (empty($openId)) {
-				util::fail('没有找到客户的openId');
-			}
-			$typeList = dict::getConfig('capitalType');
-			$capitalType = $typeList['xhOrder']['id'];
-			//流水类型、优惠卷、微信支付（h5还是小程序支付）类型 带到回调
-			$wxPayType = 0;
-			if (httpUtil::isMiniProgram()) {
-				$wxPayType = 1;
-			}
-			$attach = 'capitalType=' . $capitalType . '&couponId=' . $couponId . '&wxPayType=' . $wxPayType;
-			$wx = Yii::getAlias("@vendor/weixin");
-			require_once($wx . '/lib/WxPay.Api.php');
-			require_once($wx . '/example/WxPay.JsApiPay.php');
-			$input = new \WxPayUnifiedOrder();
-			$input->SetBody($name);
-			$input->SetOut_trade_no($orderSn);
-			$input->SetTotal_fee($totalFee * 100);
-			$input->SetTime_start(date("YmdHis", $now));
-			$input->SetAttach($attach);
-			//设置订单有效期5分钟
-			$input->SetTime_expire(date("YmdHis", $expireTime));
-			$input->SetNotify_url(Yii::$app->params['mallHost'] . '/notice/wx-callback/');
-			$input->SetTrade_type("JSAPI");
-			
-			//花卉宝代为申请的微信支付
-			$merchantExtend = $this->sjExtend;
-			if (isset($merchantExtend['wxPayApply']) && $merchantExtend['wxPayApply'] == 1) {
-				$input->SetSub_openid($openId);
-			} else {
-				$input->SetOpenid($openId);
-			}
-			//小程序使用miniAppId
-			if (httpUtil::isMiniProgram()) {
-				$merchantExtend['wxAppId'] = $merchantExtend['miniAppId'];
-			}
-			Yii::info('支付发起使用小程序信息' . json_encode($merchantExtend));
-			$wxOrder = \WxPayApi::unifiedOrder($input, 6, $merchantExtend);
-			$tools = new \JsApiPay();
-			$jsApiParameters = $tools->GetJsApiParameters($wxOrder, $merchantExtend);
-			$newParams = json_decode($jsApiParameters, true);
-			$newParams['orderId'] = $orderId;
-			util::success($newParams);
-		} elseif ($payWay == 1) {
-			$extend = MerchantExtendService::getByMerchantId($merchantId);
-			if (isset($extend['alipayInit']) == false || $extend['alipayInit'] == 0) {
-				util::fail('支付宝付款即将开通...');
-			}
-			$config = [
-				//应用ID,您的APPID。
-				'app_id' => $extend['alipayPId'],
-				//商户私钥，您的原始格式RSA私钥
-				'merchant_private_key' => $extend['alipayKey'],
-				//异步通知地址
-				'notify_url' => Yii::$app->params['mallHost'] . "/notice/alipay-callback",
-				//同步跳转
-				'return_url' => "",
-				//编码格式
-				'charset' => "UTF-8",
-				//签名方式
-				'sign_type' => "RSA2",
-				//支付宝网关
-				'gatewayUrl' => "https://openapi.alipay.com/gateway.do",
-				//支付宝公钥,查看地址：https://openhome.alipay.com/platform/keyManage.htm 对应APPID下的支付宝公钥。
-				'alipay_public_key' => $extend['alipayPublicKey'],
-			];
-			
-			Yii::info(json_encode($config) . ' aplipay config');
-			
-			$alipayWap = Yii::getAlias("@vendor/alipayWap");
-			require_once($alipayWap . '/wappay/service/AlipayTradeService.php');
-			require_once($alipayWap . '/wappay/buildermodel/AlipayTradeWapPayContentBuilder.php');
-			
-			$totalFee = $order['actPrice'];
-			$out_trade_no = $orderSn;//商户订单号，商户网站订单系统中唯一订单号，必填
-			$subject = '购买商品';//订单名称，必填
-			$total_amount = $totalFee;//付款金额，必填
-			$body = '';//商品描述，可空
-			$timeout_express = "1m";//超时时间
-			
-			$typeList = dict::getConfig('capitalType');
-			$capitalType = $typeList['xhOrder']['id'];
-			$passbackParams = 'capitalType=' . $capitalType . '&couponId=' . $couponId . '&merchantId=' . $merchantId;//将流水类型、优惠卷传过去
-			$passbackParams = urlencode($passbackParams);
-			
-			$payRequestBuilder = new \AlipayTradeWapPayContentBuilder();
-			$payRequestBuilder->setBody($body);
-			$payRequestBuilder->setSubject($subject);
-			$payRequestBuilder->setOutTradeNo($out_trade_no);
-			$payRequestBuilder->setTotalAmount($total_amount);
-			$payRequestBuilder->setTimeExpress($timeout_express);
-			//在异步通知时将该参数原样返回
-			$payRequestBuilder->setPassbackParams($passbackParams);
-			//同步通知
-			$returnUrl = Yii::$app->params['mallDomain'] . "/#/pages/callback/success?account={$merchantId}&shopId={$shopId}&orderSn={$orderSn}&totalPrice={$totalFee}&pageStatus=3&payDiscountPrice=0&payDiscountType=0";
-			//异步通知
-			$notifyUrl = Yii::$app->params['mallHost'] . "/notice/alipay-callback";
-			$payResponse = new \AlipayTradeService($config);
-			$result = $payResponse->wapPay($payRequestBuilder, $returnUrl, $notifyUrl);
-			//直接将支付宝的html返回给前端
-			echo $result;
-		} elseif ($payWay == 2) {
-			//余额支付，验证支付密码是否正确
-			$payPassword = isset($post['payPassword']) ? $post['payPassword'] : 0;
-			$user = UserService::getUserInfo($this->adminId, false);
-			UserService::validPayPassword($payPassword, $user);
-			$typeList = dict::getConfig('capitalType');
-			$capitalType = $typeList['xhOrder']['id'];
-			$callbackParams = [];
-			$respond = xhPayToolService::balancePay($callbackParams, $orderSn, $actPrice, $capitalType, $couponId);
-			$balance = isset($respond['balance']) ? $respond['balance'] : 0;
-			util::success(['discountAmount' => $discountData['discountAmount'], 'discountType' => $discountData['discountType'], 'orderSn' => $orderSn, 'orderId' => $orderId, 'balance' => $balance]);
-		} else {
-			util::fail('无效的支付方式');
-		}
-	}
-	
-	//订单评价
-	public function actionComment()
-	{
-		$post = Yii::$app->request->post();
-		$id = $post['id'];
-		$order = OrderService::getById($id);
-		OrderService::valid($order, $this->sjId);
-		if ($order['grade'] > 0) {
-			util::fail('您已经评过了');
-		}
-		OrderService::comment($post);
-		util::complete('提交成功');
-	}
-	
-	//订单详情 ssh 2019.12.16
-	public function actionDetail()
-	{
-		$id = Yii::$app->request->get('id', 0);
-		$orderSn = Yii::$app->request->get('orderSn', '');
-		$detail = [];
-		if (!empty($id)) {
-			$detail = OrderService::getOrderById($id);
-		}
-		if (!empty($orderSn)) {
-			$detail = OrderService::getOrderBySn($orderSn);
-		}
-		OrderService::valid($detail, $this->sjId);
-		util::success($detail);
-	}
-	
-	public function actionList()
-	{
-		$get = Yii::$app->request->get();
-		$search = isset($get['search']) ? $get['search'] : '';
-		$where = [];
-		$where['merchantId'] = $this->sjId;
-		if (isset($get['status']) && $get['status'] != -1) {
-			$where['status'] = $get['status'];
-		}
-		if (!empty($search)) {
-			if (stringUtil::isMobile($search)) {
-				$where['receiveMobile'] = $search;
-			} else {
-				$where['id'] = $search;
-			}
-		}
-		$searchTime = $get['searchTime'] ?? '';
-		if (!empty($searchTime)) {
-			$startTime = $get['startTime'] ?? '';
-			$endTime = $get['endTime'] ?? '';
-			$period = dateUtil::formatTime($searchTime, $startTime, $endTime);
-			$where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
-		}
-		$list = OrderService::getOrderList($where);
-		$list['asset'] = MerchantAssetService::getByMerchantId($this->sjId);
-		util::success($list);
-	}
-	
-	//订单归类 ssh 2019.12.17
-	public function actionClassify()
-	{
-		$post = Yii::$app->request->post();
-		$id = isset($post['id']) ? $post['id'] : 0;
-		$order = OrderService::getById($id);
-		OrderService::valid($order, $this->sjId);
-		$categoryId = isset($post['categoryId']) ? $post['categoryId'] : $post['categoryId'];
-		$usageId = isset($post['usageId']) ? $post['usageId'] : $post['usageId'];
-		OrderService::classify($id, $categoryId, $usageId);
-		util::complete();
-	}
-	
-	//更新配送单 ssh 2019.12.17
-	public function actionUpdateSheet()
-	{
-		$post = Yii::$app->request->post();
-		$id = isset($post['id']) ? $post['id'] : 0;
-		unset($post['id']);
-		$order = OrderService::getById($id);
-		OrderService::valid($order, $this->sjId);
-		OrderService::updateSheet($order, $post);
-		util::complete('提交成功');
-	}
-	
-	//商家收款与发货 ssh 2019.12.18
-	public function actionGathering()
-	{
-		$post = Yii::$app->request->post();
-		$price = isset($post['price']) && is_numeric($post['price']) ? $post['price'] : 0;
-		$payWay = isset($post['payWay']) && is_numeric($post['payWay']) ? $post['payWay'] : 0;
-		$userId = isset($post['userId']) ? $post['userId'] : 0;
-		$userInfo = UserService::getById($userId);
-		if (empty($userInfo) || $userInfo['merchantId'] != $this->sjId) {
-			util::fail('您选择的客户无效');
-		}
-		if ($price <= 0) {
-			util::fail('请输入金额');
-		}
-		$post['prePrice'] = $price;
-		$post['actPrice'] = $price;
-		$post['payWay'] = $payWay;
-		$post['sourceType'] = 1;
-		$post['userId'] = $userId;
-		$post['goodsNum'] = 1;
-		$post['orderName'] = '商品';
-		$shopId = MerchantService::getDefaultShopId($this->sj);
-		$post['shopId'] = $shopId;
-		$order = OrderService::addOrder($post);
-		$id = $order['id'];
-		$orderSn = $order['orderSn'];
-		
-		//流水类型列表
-		$capitalTypeList = dict::getConfig('capitalType');
-		$capitalType = $capitalTypeList['xhOrder']['id'];
-		$callbackParams = [];
-		switch ($payWay) {
-			case 0:
-				xhPayToolService::wxPay($callbackParams, $orderSn, $price, $capitalType, 0);
-				break;
-			case 1:
-				xhPayToolService::alipay($callbackParams, $orderSn, $price, $capitalType, 0, []);
-				break;
-			case 2:
-				xhPayToolService::balancePay($callbackParams, $orderSn, $price, $capitalType, 0);
-				break;
-			default:
-				util::fail('无效支付方式');
-		}
-		util::success($order);
-	}
-	
-	//免发货管理 ssh 2020.1.6
-	public function actionWithoutSend()
-	{
-		$id = Yii::$app->request->get('id');
-		$order = OrderService::getById($id);
-		OrderService::valid($order, $this->sjId);
-		//配送流程变更
-		$currentFlow = OrderSendClass::withoutSend($order);
-		util::success(['currentFlow' => $currentFlow]);
-	}
-	
-	//修改价格 ssh 2020.1.6
-	public function actionUpdatePrice()
-	{
-		$id = Yii::$app->request->get('id');
-		$price = Yii::$app->request->get('price', 1);
-		$order = OrderService::getById($id);
-		OrderService::valid($order, $this->sjId);
-		if (isset($order['modPrice']) && $order['modPrice'] == 0) {
-			util::fail('已发起支付，不能修改价格');
-		}
-		OrderService::updateById($id, ['actPrice' => $price]);
-		util::complete('修改成功');
-	}
-	
-	//配送单 ssh 2020.2.29
-	public function actionGetDeliverDetail()
-	{
-		$id = Yii::$app->request->get('id', 0);
-		$order = OrderService::getById($id);
-		OrderService::valid($order, $this->sjId);
-		$reachDate = isset($order['reachDate']) && !empty($order['reachDate']) ? $order['reachDate'] : '';
-		$reachPeriodId = $order['reachPeriod'];
-		$reachPeriodArr = [0 => '上午', 1 => '下午', 2 => '晚上'];
-		$reachPeriod = isset($reachPeriodArr[$reachPeriodId]) ? $reachPeriodArr[$reachPeriodId] : '';
-		$shopId = $order['shopId'];
-		$telephone = '';
-		if (!empty($shopId)) {
-			$shop = ShopService::getById($shopId);
-		}
-		$telephone = isset($shop['telephone']) ? $shop['telephone'] : '';
-		$bookName = isset($order['bookName']) ? $order['bookName'] : '';
-		$bookMobile = isset($order['bookMobile']) ? $order['bookMobile'] : '';
-		if (isset($order['anonymity']) && $order['anonymity'] == 1) {
-			$bookName = '--';
-			$bookMobile = '--';
-		}
-		$data = [
-			'reachDate' => $reachDate . ' ' . $reachPeriod,
-			'orderSn' => $order['orderSn'],
-			'receiveUserName' => $order['receiveUserName'],
-			'receiveMobile' => $order['receiveMobile'],
-			'fullAddress' => $order['address'] . $order['floor'] . "（" . $order['fullAddress'] . "）",
-			'cardInfo' => $order['cardInfo'],
-			'bookMobile' => $bookMobile,
-			'bookName' => $bookName,
-			'remark' => $order['remark'],
-			'sendNum' => $order['sendNum'],
-			'telephone' => 13600903070,
-			'printTime' => '',
-			'img' => '',
-		];
-		util::success($data);
-	}
-	
+
+    public $guestAccessAction = ['order-relate', 'fast-pay', 'create-order', 'list'];
+
+    //商城下单操作 ssh 2019.12.3
+    public function actionCreateOrder()
+    {
+        $post = Yii::$app->request->post();
+        $needSend = isset($post['needSend']) && is_numeric($post['needSend']) ? $post['needSend'] : 1;
+        $orderType = $post['orderType'] ?? 1;
+
+        $defaultShopId = MerchantService::getDefaultShopId($this->sj);
+        if (empty($defaultShopId)) {
+            util::fail('没有找到门店');
+        }
+        $post['merchantId'] = $this->sjId;
+        $post['shopId'] = $defaultShopId;
+        $post['payWay'] = $this->isWx == true ? 0 : 1;
+        $now = time();
+        $expireTime = $now + 1800;//订单30分钟后过期
+        $post['deadline'] = $expireTime;
+        $post['fromType'] = 1;//商城
+        $customId = $post['customId'] ?? 0;
+        if (!empty($customId)) {
+            $customId = $this->customId;
+        }
+        $post['customId'] = $customId;
+        //非门店订单
+        $store = 0;
+        $post['store'] = $store;
+
+        $couponId = isset($post['couponId']) && !empty($post['couponId']) ? $post['couponId'] : 0;
+
+        //$orderType = 1 成品订单
+        if ($orderType == 1) {
+
+            $goodsInfo = $post['goodsInfo'] ?? '';
+            $goodsInfoArr = json_decode($goodsInfo, true);
+            if (empty($goodsInfoArr)) {
+                util::fail('请选择商品');
+            }
+            //总的商品金额
+            $totalGoodsPrice = 0;
+            $orderGoods = [];
+            foreach ($goodsInfoArr as $key => $currentGoods) {
+                $currentGoodsId = $currentGoods['goodsId'];
+                $currentGoodsInfo = GoodsService::getGoodsInfo($currentGoodsId);
+                if (empty($currentGoodsInfo)) {
+                    util::fail('没有找到商品');
+                }
+                $goodsStyleId = $currentGoods['goodsStyleId'];
+                $goodsNum = $currentGoods['goodsNum'];
+                //计算总金额
+                $unitPrice = $currentGoodsInfo['price'];
+                $goodsStyleList = isset($currentGoodsInfo['goodsStyleList']) ? $currentGoodsInfo['goodsStyleList'] : [];
+                if (!empty($goodsStyleId)) {
+                    if (empty($goodsStyleList)) {
+                        util::fail('商品款式没有找到');
+                    }
+                    $styleIdList = array_keys($goodsStyleList);
+                    if (in_array($goodsStyleId, $styleIdList) == false) {
+                        util::fail('商品款式没有找到！');
+                    }
+                    $unitPrice = isset($goodsStyleList[$goodsStyleId]['price']) ? $goodsStyleList[$goodsStyleId]['price'] : 9999;
+                }
+                $goodsPrice = $unitPrice * $goodsNum;
+                $totalGoodsPrice = stringUtil::calcAdd($totalGoodsPrice, $goodsPrice);
+
+                $orderGoods[] = [
+                    'goodsId' => $currentGoodsId,
+                    'userId' => $this->adminId,
+                    'merchantId' => $this->sjId,
+                    'title' => $currentGoodsInfo['goodsName'],
+                    'cover' => isset($goodsInfo['shortImgList']) && !empty($currentGoodsInfo['shortImgList']) ? current($currentGoodsInfo['shortImgList']) : '',
+                    'unitPrice' => $unitPrice,
+                    'num' => $goodsNum,
+                    'goodsStyleName' => isset($currentGoodsInfo['goodsStyleList'][$goodsStyleId]['title']) ? $currentGoodsInfo['goodsStyleList'][$goodsStyleId]['title'] : '',
+                    'goodsStyleId' => $goodsStyleId,
+                    'createTime' => date("Y-m-d H:i:s"),
+                ];
+
+            }
+
+            $user = $this->custom;
+            $post['bookName'] = isset($user['name']) ? $user['name'] : '';
+            $bookMobile = isset($post['bookMobile']) && !empty($post['bookMobile']) && stringUtil::isMobile($post['bookMobile']) ? $post['bookMobile'] : '';
+            $bookMobile = empty($bookMobile) && isset($user['mobile']) && !empty($user['mobile']) ? $user['mobile'] : $bookMobile;
+            $post['bookMobile'] = $bookMobile;
+
+            //计算运费
+            $post['sendDistance'] = isset($post['sendDistance']) ? $post['sendDistance'] : 0;
+            $sendCost = 0;
+            //按距离计算运费并且客户要求送的
+            //运费计算方式
+            $freightType = 0;
+            if ($freightType == 0 && $needSend == 1) {
+                $lat = $post['latitude'];//收货人纬度
+                $lng = $post['longitude'];//收货人经度
+                $respond = ExpressService::getUserDistance($lng, $lat, $defaultShopId, $this->sjExtend);
+                $sendCost = isset($respond['fee']) ? $respond['fee'] : 0;
+            }
+            $post['sendCost'] = $sendCost;
+
+            $prePrice = stringUtil::calcAdd($sendCost, $totalGoodsPrice);
+
+            //来源 0微信 1支付宝 2小程序 3朋友圈 4美团
+            $sourceType = $this->isWx ? 0 : 1;
+            if (httpUtil::isMiniProgram()) {
+                $sourceType = 2;
+            }
+            $discountData = OrderService::getDiscountPrice(['price' => $prePrice, 'sourceType' => $sourceType, 'couponId' => $couponId, 'userId' => $this->adminId]);
+            $actPrice = $discountData['price'];
+            $post['discountType'] = $discountData['discountType'];
+            $post['discountAmount'] = $discountData['discountAmount'];
+            $post['prePrice'] = $prePrice;
+            $post['actPrice'] = $actPrice;
+            $order = OrderClass::addOrder($post);
+            $orderId = $order['id'];
+            $orderSn = $order['orderSn'];
+
+            foreach ($orderGoods as $key => $val) {
+                $val['orderId'] = $orderId;
+                $val['orderSn'] = $orderSn;
+                OrderGoodsService::add($val);//创建订单商品列表
+            }
+        } else {
+            //$orderType = 2 花材订单
+
+            $productData = $post['product'] ?? '';
+            $product = json_decode($productData, true);
+            if (empty($product)) {
+                util::fail('请选择花材');
+            }
+            $actPrice = 0;
+            $orderProduct = [];
+            foreach ($product as $key => $val) {
+                $productId = $val['productId'];
+                $bigNum = $val['bigNum'];
+                $smallNum = $val['smallNum'];
+                $actPrice += 2;
+                $orderProduct[] = [
+                    'productId' => $productId,
+                    'bigNum' => $bigNum,
+                    'smallNum' => $smallNum,
+                ];
+            }
+
+            $post['prePrice'] = $actPrice;
+            $post['actPrice'] = $actPrice;
+            $order = OrderClass::addOrder($post);
+            $orderId = $order['id'];
+            $orderSn = $order['orderSn'];
+
+            foreach ($orderProduct as $key => $val) {
+                $val['orderSn'] = $orderSn;
+                OrderItemClass::add($val);
+            }
+
+        }
+        util::success(['orderSn' => $orderSn, 'totalPrice' => $actPrice, 'couponId' => $couponId, 'orderId' => $orderId]);
+    }
+
+    //下单要用到的相关信息 ssh 2019.12.6
+    public function actionOrderRelate()
+    {
+        $regionTree = RegionService::tree();
+        $shop = ShopService::getDefaultShop($this->sj);
+        $freight = MerchantExtendService::getFreight($this->sjExtend);
+        $mapKey = 'OFWBZ-2NTHP-EHNDD-LKWQY-GANM7-PXBJH';
+        $out = ['freight' => $freight, 'shop' => $shop, 'region' => $regionTree, 'txMapKey' => $mapKey, 'merchant' => $this->sj];
+        util::success($out);
+    }
+
+    //余额支付 ssh 2019.12.6
+    public function actionBalancePay()
+    {
+        $post = Yii::$app->request->post();
+        $orderSn = isset($post['orderSn']) ? $post['orderSn'] : 0;
+        $payPassword = isset($post['payPassword']) ? $post['payPassword'] : 0;
+        $couponId = isset($post['couponId']) ? $post['couponId'] : 0;
+
+        //验证优惠券是否还有效
+        if (!empty($couponId)) {
+            CouponService::checkBeforeUse($couponId, $order['prePrice'], $order['userId']);
+        }
+
+        $order = OrderService::getByOrderSn($orderSn);
+        $userId = $this->adminId;
+        $user = UserService::getUserInfo($userId, false);
+        //验证支付密码是否正确
+        UserService::validPayPassword($payPassword, $user);
+        //支付前验证订单有效性
+        OrderService::checkBeforePay($order, $this->adminId);
+        $typeList = dict::getConfig('capitalType');
+        $capitalType = $typeList['xhOrder']['id'];
+        $totalFee = $order['prePrice'];
+        $sourceType = 0;
+        $discountData = OrderService::getDiscountPrice(['price' => $totalFee, 'sourceType' => $sourceType, 'couponId' => $couponId, 'userId' => $this->adminId]);
+        $actPrice = $discountData['price'];
+        $callbackParams = [];
+        $respond = xhPayToolService::balancePay($callbackParams, $orderSn, $actPrice, $capitalType, $couponId);
+        $balance = isset($respond['balance']) ? $respond['balance'] : 0;
+        util::success(['discountAmount' => $discountData['discountAmount'], 'discountType' => $discountData['discountType'], 'balance' => $balance]);
+    }
+
+    //获取商城下单要用的微信支付和小程序支付参数 ssh 2019.21.3
+    public function actionWxPay()
+    {
+        ini_set('date.timezone', 'Asia/Shanghai');
+        $post = Yii::$app->request->post();
+        $couponId = isset($post['couponId']) ? $post['couponId'] : 0;
+        $orderSn = isset($post['orderSn']) ? $post['orderSn'] : 0;
+        $order = OrderService::getByOrderSn($orderSn);
+        $orderId = $order['id'];
+
+        //验证优惠券是否还有效
+        if (!empty($couponId)) {
+            CouponService::checkBeforeUse($couponId, $order['prePrice'], $order['userId']);
+        }
+
+        //支付前验证订单有效性
+        OrderService::checkBeforePay($order, $this->adminId);
+
+        $name = isset($order['orderName']) && !empty($order['orderName']) ? $order['orderName'] : '购买商品';
+        $totalFee = $order['actPrice'];
+
+        //小程序使用miniOpenId
+        if (httpUtil::isMiniProgram()) {
+            $openId = $this->user['miniOpenId'];
+        } else {
+            $openId = $this->user['openId'];
+        }
+        $typeList = dict::getConfig('capitalType');
+        $capitalType = $typeList['xhOrder']['id'];
+        //流水类型、优惠卷、微信支付（h5还是小程序支付）类型 带到回调
+        $wxPayType = 0;
+        if (httpUtil::isMiniProgram()) {
+            $wxPayType = 1;
+        }
+        $attach = "couponId=" . $couponId . "&capitalType=" . $capitalType . '&wxPayType=' . $wxPayType;
+        //订单30分钟后过期
+        $now = time();
+        $expireTime = $now + 1800;
+
+        $wx = Yii::getAlias("@vendor/weixin");
+        require_once($wx . '/lib/WxPay.Api.php');
+        require_once($wx . '/example/WxPay.JsApiPay.php');
+        $input = new \WxPayUnifiedOrder();
+        $input->SetBody($name);
+        $input->SetOut_trade_no($orderSn);
+        $input->SetTotal_fee($totalFee * 100);
+        $input->SetTime_start(date("YmdHis", $now));
+        $input->SetAttach($attach);//将流水类型、代金劵等传给微信再回传
+        $input->SetTime_expire(date("YmdHis", $expireTime));
+        $input->SetNotify_url(Yii::$app->params['mallHost'] . '/notice/wx-callback/');
+        $input->SetTrade_type("JSAPI");
+
+        //花卉宝代为申请的微信支付
+        $merchantExtend = $this->sjExtend;
+        if (isset($merchantExtend['wxPayApply']) && $merchantExtend['wxPayApply'] == 1) {
+            $input->SetSub_openid($openId);
+        } else {
+            $input->SetOpenid($openId);
+        }
+        //小程序使用miniAppId
+        if (httpUtil::isMiniProgram()) {
+            $merchantExtend['wxAppId'] = $merchantExtend['miniAppId'];
+        }
+
+        $wxOrder = \WxPayApi::unifiedOrder($input, 6, $merchantExtend);
+        $tools = new \JsApiPay();
+        $jsApiParameters = $tools->GetJsApiParameters($wxOrder, $merchantExtend);
+        $newParams = json_decode($jsApiParameters, true);
+        //已请求微信不能修改价格
+        $updateData = [];
+        $updateData['modPrice'] = 0;
+        if (empty($order['deadline'])) {
+            $updateData['deadline'] = $expireTime;
+        }
+        OrderService::updateById($orderId, $updateData);
+        util::success($newParams);
+    }
+
+    //快捷付款订单
+    public function actionFastPay()
+    {
+        ini_set('date.timezone', 'Asia/Shanghai');
+        $post = Yii::$app->request->post();
+        $payWay = isset($post['payWay']) ? $post['payWay'] : 0;
+        $shopId = !empty($this->shopId) ? $this->shopId : ShopService::getDefaultShopId($this->sj);
+        //验证门店是否有效
+        $shopInfo = ShopService::getById($shopId);
+        ShopService::valid($shopInfo, $this->sjId);
+        $post['shopId'] = $shopId;
+        //默认门店订单
+        $store = isset($post['store']) ? $post['store'] : 1;
+        $post['store'] = $store;
+        //来源 0微信 1支付宝 2小程序 3朋友圈 4美团
+        $sourceType = $this->isWx ? 0 : 1;
+        if (httpUtil::isMiniProgram()) {
+            $sourceType = 2;
+        }
+        $sourceType = isset($post['sourceType']) ? $post['sourceType'] : 0;
+        //兼容旧系统sourceType=3表示朋友圈来源
+        $fromType = $sourceType == 3 ? 2 : 0;
+        $fromType = isset($post['fromType']) && !empty($post['fromType']) ? $post['fromType'] : $fromType;
+        $post['userId'] = $this->adminId;
+        $custom = $this->custom;
+        $post['bookName'] = $custom['userName'] ?? '';
+        $bookMobile = isset($post['bookMobile']) && !empty($post['bookMobile']) && stringUtil::isMobile($post['bookMobile']) ? $post['bookMobile'] : '';
+        $bookMobile = empty($bookMobile) && isset($custom['mobile']) && !empty($custom['mobile']) ? $custom['mobile'] : $bookMobile;
+        $post['bookMobile'] = $bookMobile;
+        $prePrice = round($post['prePrice'], 2);
+        $couponId = isset($post['couponId']) ? $post['couponId'] : 0;
+        $discountData = OrderService::getDiscountPrice(['price' => $prePrice, 'sourceType' => $sourceType, 'couponId' => $couponId, 'userId' => $this->adminId]);
+        $actPrice = $discountData['price'];
+        $post['discountType'] = $discountData['discountType'];
+        $post['discountAmount'] = $discountData['discountAmount'];
+        $post['actPrice'] = $actPrice;
+        $post['payStyle'] = 0;
+        $post['merchantId'] = $this->sjId;
+        $now = time();
+        $expireTime = $now + 300;//订单5分钟后过期
+        $post['createTime'] = date("Y-m-d H:i:s", $now);
+        $post['deadline'] = $expireTime;
+        if ($actPrice <= 0) {
+            util::fail('请填写正确的金额');
+        }
+        //微信支付订单提交不能修改价格
+        $post['modPrice'] = $this->isWx ? 0 : 1;
+        $post['sourceType'] = $sourceType;
+        $post['goodsNum'] = 1;
+        $post['fromType'] = $fromType;
+        $order = OrderService::addOrder($post);
+        $orderId = $order['id'];
+        $orderSn = $order['orderSn'];
+        $merchantId = $this->sjId;
+        if ($payWay == 0) {
+            $orderId = $order['id'];
+            $name = '购买商品';
+            $totalFee = $actPrice;
+            $user = UserService::getById($this->adminId);
+            $openId = isset($user['openId']) ? $user['openId'] : 0;
+            if (httpUtil::isMiniProgram()) {
+                //小程序使用miniOpenId
+                $openId = $user['miniOpenId'];
+            }
+            if (empty($openId)) {
+                util::fail('没有找到客户的openId');
+            }
+            $typeList = dict::getConfig('capitalType');
+            $capitalType = $typeList['xhOrder']['id'];
+            //流水类型、优惠卷、微信支付（h5还是小程序支付）类型 带到回调
+            $wxPayType = 0;
+            if (httpUtil::isMiniProgram()) {
+                $wxPayType = 1;
+            }
+            $attach = 'capitalType=' . $capitalType . '&couponId=' . $couponId . '&wxPayType=' . $wxPayType;
+            $wx = Yii::getAlias("@vendor/weixin");
+            require_once($wx . '/lib/WxPay.Api.php');
+            require_once($wx . '/example/WxPay.JsApiPay.php');
+            $input = new \WxPayUnifiedOrder();
+            $input->SetBody($name);
+            $input->SetOut_trade_no($orderSn);
+            $input->SetTotal_fee($totalFee * 100);
+            $input->SetTime_start(date("YmdHis", $now));
+            $input->SetAttach($attach);
+            //设置订单有效期5分钟
+            $input->SetTime_expire(date("YmdHis", $expireTime));
+            $input->SetNotify_url(Yii::$app->params['mallHost'] . '/notice/wx-callback/');
+            $input->SetTrade_type("JSAPI");
+
+            //花卉宝代为申请的微信支付
+            $merchantExtend = $this->sjExtend;
+            if (isset($merchantExtend['wxPayApply']) && $merchantExtend['wxPayApply'] == 1) {
+                $input->SetSub_openid($openId);
+            } else {
+                $input->SetOpenid($openId);
+            }
+            //小程序使用miniAppId
+            if (httpUtil::isMiniProgram()) {
+                $merchantExtend['wxAppId'] = $merchantExtend['miniAppId'];
+            }
+            Yii::info('支付发起使用小程序信息' . json_encode($merchantExtend));
+            $wxOrder = \WxPayApi::unifiedOrder($input, 6, $merchantExtend);
+            $tools = new \JsApiPay();
+            $jsApiParameters = $tools->GetJsApiParameters($wxOrder, $merchantExtend);
+            $newParams = json_decode($jsApiParameters, true);
+            $newParams['orderId'] = $orderId;
+            util::success($newParams);
+        } elseif ($payWay == 1) {
+            $extend = MerchantExtendService::getByMerchantId($merchantId);
+            if (isset($extend['alipayInit']) == false || $extend['alipayInit'] == 0) {
+                util::fail('支付宝付款即将开通...');
+            }
+            $config = [
+                //应用ID,您的APPID。
+                'app_id' => $extend['alipayPId'],
+                //商户私钥，您的原始格式RSA私钥
+                'merchant_private_key' => $extend['alipayKey'],
+                //异步通知地址
+                'notify_url' => Yii::$app->params['mallHost'] . "/notice/alipay-callback",
+                //同步跳转
+                'return_url' => "",
+                //编码格式
+                'charset' => "UTF-8",
+                //签名方式
+                'sign_type' => "RSA2",
+                //支付宝网关
+                'gatewayUrl' => "https://openapi.alipay.com/gateway.do",
+                //支付宝公钥,查看地址：https://openhome.alipay.com/platform/keyManage.htm 对应APPID下的支付宝公钥。
+                'alipay_public_key' => $extend['alipayPublicKey'],
+            ];
+
+            Yii::info(json_encode($config) . ' aplipay config');
+
+            $alipayWap = Yii::getAlias("@vendor/alipayWap");
+            require_once($alipayWap . '/wappay/service/AlipayTradeService.php');
+            require_once($alipayWap . '/wappay/buildermodel/AlipayTradeWapPayContentBuilder.php');
+
+            $totalFee = $order['actPrice'];
+            $out_trade_no = $orderSn;//商户订单号，商户网站订单系统中唯一订单号，必填
+            $subject = '购买商品';//订单名称，必填
+            $total_amount = $totalFee;//付款金额，必填
+            $body = '';//商品描述，可空
+            $timeout_express = "1m";//超时时间
+
+            $typeList = dict::getConfig('capitalType');
+            $capitalType = $typeList['xhOrder']['id'];
+            $passbackParams = 'capitalType=' . $capitalType . '&couponId=' . $couponId . '&merchantId=' . $merchantId;//将流水类型、优惠卷传过去
+            $passbackParams = urlencode($passbackParams);
+
+            $payRequestBuilder = new \AlipayTradeWapPayContentBuilder();
+            $payRequestBuilder->setBody($body);
+            $payRequestBuilder->setSubject($subject);
+            $payRequestBuilder->setOutTradeNo($out_trade_no);
+            $payRequestBuilder->setTotalAmount($total_amount);
+            $payRequestBuilder->setTimeExpress($timeout_express);
+            //在异步通知时将该参数原样返回
+            $payRequestBuilder->setPassbackParams($passbackParams);
+            //同步通知
+            $returnUrl = Yii::$app->params['mallDomain'] . "/#/pages/callback/success?account={$merchantId}&shopId={$shopId}&orderSn={$orderSn}&totalPrice={$totalFee}&pageStatus=3&payDiscountPrice=0&payDiscountType=0";
+            //异步通知
+            $notifyUrl = Yii::$app->params['mallHost'] . "/notice/alipay-callback";
+            $payResponse = new \AlipayTradeService($config);
+            $result = $payResponse->wapPay($payRequestBuilder, $returnUrl, $notifyUrl);
+            //直接将支付宝的html返回给前端
+            echo $result;
+        } elseif ($payWay == 2) {
+            //余额支付，验证支付密码是否正确
+            $payPassword = isset($post['payPassword']) ? $post['payPassword'] : 0;
+            $user = UserService::getUserInfo($this->adminId, false);
+            UserService::validPayPassword($payPassword, $user);
+            $typeList = dict::getConfig('capitalType');
+            $capitalType = $typeList['xhOrder']['id'];
+            $callbackParams = [];
+            $respond = xhPayToolService::balancePay($callbackParams, $orderSn, $actPrice, $capitalType, $couponId);
+            $balance = isset($respond['balance']) ? $respond['balance'] : 0;
+            util::success(['discountAmount' => $discountData['discountAmount'], 'discountType' => $discountData['discountType'], 'orderSn' => $orderSn, 'orderId' => $orderId, 'balance' => $balance]);
+        } else {
+            util::fail('无效的支付方式');
+        }
+    }
+
+    //订单评价
+    public function actionComment()
+    {
+        $post = Yii::$app->request->post();
+        $id = $post['id'];
+        $order = OrderService::getById($id);
+        OrderService::valid($order, $this->sjId);
+        if ($order['grade'] > 0) {
+            util::fail('您已经评过了');
+        }
+        OrderService::comment($post);
+        util::complete('提交成功');
+    }
+
+    //订单详情 ssh 2019.12.16
+    public function actionDetail()
+    {
+        $id = Yii::$app->request->get('id', 0);
+        $orderSn = Yii::$app->request->get('orderSn', '');
+        $detail = [];
+        if (!empty($id)) {
+            $detail = OrderService::getOrderById($id);
+        }
+        if (!empty($orderSn)) {
+            $detail = OrderService::getOrderBySn($orderSn);
+        }
+        OrderService::valid($detail, $this->sjId);
+        util::success($detail);
+    }
+
+    public function actionList()
+    {
+        $get = Yii::$app->request->get();
+        $search = isset($get['search']) ? $get['search'] : '';
+        $where = [];
+        $where['merchantId'] = $this->sjId;
+        if (!empty($get['status'])) {
+            $where['status'] = $get['status'];
+        }
+        if (!empty($search)) {
+            if (stringUtil::isMobile($search)) {
+                $where['receiveMobile'] = $search;
+            } else {
+                $where['id'] = $search;
+            }
+        }
+        $searchTime = $get['searchTime'] ?? '';
+        if (!empty($searchTime)) {
+            $startTime = $get['startTime'] ?? '';
+            $endTime = $get['endTime'] ?? '';
+            $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
+            $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
+        }
+        $list = OrderService::getOrderList($where);
+        $list['asset'] = MerchantAssetService::getByMerchantId($this->sjId);
+        util::success($list);
+    }
+
+    //订单归类 ssh 2019.12.17
+    public function actionClassify()
+    {
+        $post = Yii::$app->request->post();
+        $id = isset($post['id']) ? $post['id'] : 0;
+        $order = OrderService::getById($id);
+        OrderService::valid($order, $this->sjId);
+        $categoryId = isset($post['categoryId']) ? $post['categoryId'] : $post['categoryId'];
+        $usageId = isset($post['usageId']) ? $post['usageId'] : $post['usageId'];
+        OrderService::classify($id, $categoryId, $usageId);
+        util::complete();
+    }
+
+    //更新配送单 ssh 2019.12.17
+    public function actionUpdateSheet()
+    {
+        $post = Yii::$app->request->post();
+        $id = isset($post['id']) ? $post['id'] : 0;
+        unset($post['id']);
+        $order = OrderService::getById($id);
+        OrderService::valid($order, $this->sjId);
+        OrderService::updateSheet($order, $post);
+        util::complete('提交成功');
+    }
+
+    //商家收款与发货 ssh 2019.12.18
+    public function actionGathering()
+    {
+        $post = Yii::$app->request->post();
+        $price = isset($post['price']) && is_numeric($post['price']) ? $post['price'] : 0;
+        $payWay = isset($post['payWay']) && is_numeric($post['payWay']) ? $post['payWay'] : 0;
+        $userId = isset($post['userId']) ? $post['userId'] : 0;
+        $userInfo = UserService::getById($userId);
+        if (empty($userInfo) || $userInfo['merchantId'] != $this->sjId) {
+            util::fail('您选择的客户无效');
+        }
+        if ($price <= 0) {
+            util::fail('请输入金额');
+        }
+        $post['prePrice'] = $price;
+        $post['actPrice'] = $price;
+        $post['payWay'] = $payWay;
+        $post['sourceType'] = 1;
+        $post['userId'] = $userId;
+        $post['goodsNum'] = 1;
+        $post['orderName'] = '商品';
+        $shopId = MerchantService::getDefaultShopId($this->sj);
+        $post['shopId'] = $shopId;
+        $order = OrderService::addOrder($post);
+        $id = $order['id'];
+        $orderSn = $order['orderSn'];
+
+        //流水类型列表
+        $capitalTypeList = dict::getConfig('capitalType');
+        $capitalType = $capitalTypeList['xhOrder']['id'];
+        $callbackParams = [];
+        switch ($payWay) {
+            case 0:
+                xhPayToolService::wxPay($callbackParams, $orderSn, $price, $capitalType, 0);
+                break;
+            case 1:
+                xhPayToolService::alipay($callbackParams, $orderSn, $price, $capitalType, 0, []);
+                break;
+            case 2:
+                xhPayToolService::balancePay($callbackParams, $orderSn, $price, $capitalType, 0);
+                break;
+            default:
+                util::fail('无效支付方式');
+        }
+        util::success($order);
+    }
+
+    //免发货管理 ssh 2020.1.6
+    public function actionWithoutSend()
+    {
+        $id = Yii::$app->request->get('id');
+        $order = OrderService::getById($id);
+        OrderService::valid($order, $this->sjId);
+        //配送流程变更
+        $currentFlow = OrderSendClass::withoutSend($order);
+        util::success(['currentFlow' => $currentFlow]);
+    }
+
+    //修改价格 ssh 2020.1.6
+    public function actionUpdatePrice()
+    {
+        $id = Yii::$app->request->get('id');
+        $price = Yii::$app->request->get('price', 1);
+        $order = OrderService::getById($id);
+        OrderService::valid($order, $this->sjId);
+        if (isset($order['modPrice']) && $order['modPrice'] == 0) {
+            util::fail('已发起支付，不能修改价格');
+        }
+        OrderService::updateById($id, ['actPrice' => $price]);
+        util::complete('修改成功');
+    }
+
+    //配送单 ssh 2020.2.29
+    public function actionGetDeliverDetail()
+    {
+        $id = Yii::$app->request->get('id', 0);
+        $order = OrderService::getById($id);
+        OrderService::valid($order, $this->sjId);
+        $reachDate = isset($order['reachDate']) && !empty($order['reachDate']) ? $order['reachDate'] : '';
+        $reachPeriodId = $order['reachPeriod'];
+        $reachPeriodArr = [0 => '上午', 1 => '下午', 2 => '晚上'];
+        $reachPeriod = isset($reachPeriodArr[$reachPeriodId]) ? $reachPeriodArr[$reachPeriodId] : '';
+        $shopId = $order['shopId'];
+        $telephone = '';
+        if (!empty($shopId)) {
+            $shop = ShopService::getById($shopId);
+        }
+        $telephone = isset($shop['telephone']) ? $shop['telephone'] : '';
+        $bookName = isset($order['bookName']) ? $order['bookName'] : '';
+        $bookMobile = isset($order['bookMobile']) ? $order['bookMobile'] : '';
+        if (isset($order['anonymity']) && $order['anonymity'] == 1) {
+            $bookName = '--';
+            $bookMobile = '--';
+        }
+        $data = [
+            'reachDate' => $reachDate . ' ' . $reachPeriod,
+            'orderSn' => $order['orderSn'],
+            'receiveUserName' => $order['receiveUserName'],
+            'receiveMobile' => $order['receiveMobile'],
+            'fullAddress' => $order['address'] . $order['floor'] . "（" . $order['fullAddress'] . "）",
+            'cardInfo' => $order['cardInfo'],
+            'bookMobile' => $bookMobile,
+            'bookName' => $bookName,
+            'remark' => $order['remark'],
+            'sendNum' => $order['sendNum'],
+            'telephone' => 13600903070,
+            'printTime' => '',
+            'img' => '',
+        ];
+        util::success($data);
+    }
+
 }

biz-ghs/shop/services/ShopAdminService.php

@@ -109,12 +109,6 @@ class ShopAdminService extends BaseService
             $roleId = $val['roleId'];
             $roleName = isset($roleList[$roleId]['roleName']) ? $roleList[$roleId]['roleName'] : '';
             $list[$key]['roleName'] = $roleName;
-            //帐号状态
-            $status = 1;
-            if (isset($val['status']) && $val['status'] == 0) {
-                $status = 0;
-            }
-            $list[$key]['status'] = $status;
             $avatar = $prefix . 'hhb_small.png';
             if (isset($val['avatar']) && !empty($val['avatar'])) {
                 $avatar = $prefix . $val['avatar'];

sql.sql

@@ -25,6 +25,13 @@ wxOpen 平台和公众号 小程序要补好
 
 确认app模块下的hd ghs pt mall里的runtime有没创建成功 web里的assets是否创建成功
 
+
+======
+
+
+要初始化的东西 花材的重复 花材的比例
+
+
 =============================================================================
 
 CREATE TABLE xhItem(
@@ -1951,3 +1958,24 @@ ADD COLUMN `name`  varchar(50) NOT NULL DEFAULT '' COMMENT '花材名称' AFTER
 ADD COLUMN `cover`  varchar(500) NOT NULL DEFAULT '' COMMENT '花材图片' AFTER `name`,
 ADD COLUMN `stockWarning`  decimal(9,2) NOT NULL DEFAULT 0 COMMENT '库存预警' AFTER `addPrice`;
 
+=======
+
+=====shish 2021-4-7
+UPDATE `xhPtItem` SET ratio = 1 WHERE ratio=0;
+ALTER TABLE xhGhsCustom ADD `growth` INT(11) NOT NULL DEFAULT '0' COMMENT '成长值' AFTER `dist`;
+ALTER TABLE xhGhsCustom ADD `visitTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后一次访问时间';
+ALTER TABLE xhCustom MODIFY `visitTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后一次访问时间';
+ALTER TABLE `xhItem` MODIFY `stockWarning` MEDIUMINT NOT NULL DEFAULT 0 COMMENT '库存预警，大单位数量';
+ALTER TABLE `xhGhsItem` MODIFY `stockWarning` MEDIUMINT NOT NULL DEFAULT 0 COMMENT '库存预警，大单位数量';
+ALTER TABLE xhPtItem ADD `stockWarning` MEDIUMINT NOT NULL DEFAULT 0 COMMENT '库存预警，大单位数量' AFTER `weight`;
+UPDATE xhPtItem SET stockWarning=5;
+ALTER TABLE xhGhsCustom CHANGE  buyAmount `totalExpend` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计消费';
+ALTER TABLE xhGhsCustom CHANGE `totalExpend` buyAmount DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计消费';
+ALTER TABLE xhCustom CHANGE `totalExpend` `buyAmount` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计消费';
+ALTER TABLE xhCustom ADD buyNum INT NOT NULL DEFAULT 0 COMMENT '消费次数' AFTER `buyAmount`;
+ALTER TABLE xhGhsCustom ADD rechargeAmount DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值' AFTER `buyAmount`;
+ALTER TABLE xhCustom ADD rechargeAmount DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值' AFTER `buyNum`;
+ALTER TABLE xhCustom DROP COLUMN totalRecharge;
+ALTER TABLE xhCustom CHANGE `rechargeAmount` `recharge` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值';
+ALTER TABLE xhGhsCustom CHANGE `rechargeAmount` `recharge` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值';
+