From ea64b8086714dedcf3f160a3fd8f0b4fbb918132 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Fri, 10 May 2019 09:34:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=92=A9=E5=AD=90=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E5=BC=95=E7=94=A8=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/Api/Express.php                           |  2 +-
 extend/behavior/admin/OrderBehavior.php          | 12 ++----------
 extend/behavior/product/ProductBehavior.php      |  2 +-
 extend/behavior/routine/StoreProductBehavior.php | 14 +++++++-------
 extend/behavior/wap/StoreProductBehavior.php     |  4 ++--
 extend/behavior/wechat/MessageBehavior.php       |  2 +-
 extend/behavior/wechat/PaymentBehavior.php       | 11 +++++------
 extend/behavior/wechat/UserBehavior.php          |  3 +++
 8 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/extend/Api/Express.php b/extend/Api/Express.php
index 334fd070..fe87bea3 100644
--- a/extend/Api/Express.php
+++ b/extend/Api/Express.php
@@ -9,7 +9,7 @@ namespace Api;
 
 
 use service\HttpService;
-use service\SystemConfigService;
+use app\core\util\SystemConfigService;
 
 class Express
 {
diff --git a/extend/behavior/admin/OrderBehavior.php b/extend/behavior/admin/OrderBehavior.php
index 4c64b6ee..39b6e867 100644
--- a/extend/behavior/admin/OrderBehavior.php
+++ b/extend/behavior/admin/OrderBehavior.php
@@ -7,16 +7,9 @@
 
 namespace behavior\admin;
 
-use app\admin\model\routine\RoutineFormId;
-use basic\ModelBasic;
 use app\admin\model\user\User;
 use app\admin\model\order\StoreOrder as AdminStoreOrder;
-use app\admin\model\user\UserAddress;
-use app\admin\model\user\UserBill;
-use app\admin\model\wechat\WechatUser;
-use service\SystemConfigService;
-use service\WechatTemplateService;
-use service\RoutineTemplateService;
+use app\core\util\WechatTemplateService;
 
 class OrderBehavior
 {
@@ -44,7 +37,6 @@ class OrderBehavior
      */
     public static function storeProductOrderDeliveryGoodsAfter($data,$oid){
         AdminStoreOrder::orderPostageAfter($oid,$data);
-//        AdminStoreOrder::sendOrderGoods($oid,$data);
     }
 
     /**
@@ -84,7 +76,7 @@ class OrderBehavior
      * $oid  string store_order表中的id
      */
     public static function storeProductOrderRefundNAfter($data,$oid){
-
+        AdminStoreOrder::refundNoPrieTemplate($oid,$data);
     }
     /**
      * 线下付款
diff --git a/extend/behavior/product/ProductBehavior.php b/extend/behavior/product/ProductBehavior.php
index 8302ffee..50603487 100644
--- a/extend/behavior/product/ProductBehavior.php
+++ b/extend/behavior/product/ProductBehavior.php
@@ -57,7 +57,7 @@ class ProductBehavior
      */
     public static function storeProductOrderCreate($order,$group)
     {
-        
+
     }
 
 
diff --git a/extend/behavior/routine/StoreProductBehavior.php b/extend/behavior/routine/StoreProductBehavior.php
index 2be9e30c..27f59400 100644
--- a/extend/behavior/routine/StoreProductBehavior.php
+++ b/extend/behavior/routine/StoreProductBehavior.php
@@ -8,14 +8,14 @@
 namespace behavior\routine;
 
 
-use app\routine\model\store\StoreOrder;
-use app\routine\model\routine\RoutineTemplate;
-use app\routine\model\user\User;
-use app\routine\model\user\WechatUser;
-use app\routine\model\user\UserAddress;
+use app\ebapi\model\store\StoreOrder;
+use app\core\model\routine\RoutineTemplate;
+use app\core\model\user\User;
+use app\ebapi\model\user\WechatUser;
+use app\ebapi\model\user\UserAddress;
 use app\admin\model\order\StoreOrder as StoreOrderAdminModel;
-use service\SystemConfigService;
-use service\WechatTemplateService;
+use app\core\util\SystemConfigService;
+use app\core\util\WechatTemplateService;
 
 class StoreProductBehavior
 {
diff --git a/extend/behavior/wap/StoreProductBehavior.php b/extend/behavior/wap/StoreProductBehavior.php
index c92f2697..9b3aca18 100644
--- a/extend/behavior/wap/StoreProductBehavior.php
+++ b/extend/behavior/wap/StoreProductBehavior.php
@@ -17,8 +17,8 @@ use app\wap\model\user\UserBill;
 use app\wap\model\user\WechatUser;
 use basic\ModelBasic;
 use app\admin\model\order\StoreOrder as StoreOrderAdminModel;
-use service\SystemConfigService;
-use service\WechatTemplateService;
+use app\core\util\SystemConfigService;
+use app\core\util\WechatTemplateService;
 
 class StoreProductBehavior
 {
diff --git a/extend/behavior/wechat/MessageBehavior.php b/extend/behavior/wechat/MessageBehavior.php
index 9c002bc9..2b736918 100644
--- a/extend/behavior/wechat/MessageBehavior.php
+++ b/extend/behavior/wechat/MessageBehavior.php
@@ -12,7 +12,7 @@ use app\admin\model\wechat\WechatMessage;
 use app\admin\model\wechat\WechatReply;
 use app\wap\model\user\WechatUser;
 use service\HookService;
-use service\QrcodeService;
+use app\core\util\QrcodeService;
 
 /**
  * 用户消息行为
diff --git a/extend/behavior/wechat/PaymentBehavior.php b/extend/behavior/wechat/PaymentBehavior.php
index adc99549..b08dc26a 100644
--- a/extend/behavior/wechat/PaymentBehavior.php
+++ b/extend/behavior/wechat/PaymentBehavior.php
@@ -9,12 +9,12 @@ namespace behavior\wechat;
 
 
 use app\admin\model\wechat\WechatMessage;
-use app\routine\model\store\StoreOrder as StoreOrderRoutineModel;
+use app\ebapi\model\store\StoreOrder as StoreOrderRoutineModel;
 use app\wap\model\store\StoreOrder as StoreOrderWapModel;
 use app\wap\model\user\UserRecharge;
 use service\HookService;
-use service\WechatService;
-use service\MiniProgramService;
+use app\core\util\WechatService;
+use app\core\util\MiniProgramService;
 
 class PaymentBehavior
 {
@@ -70,6 +70,7 @@ class PaymentBehavior
 
     /**
      * 商品订单支付成功后  小程序
+     *
      * @param $orderId
      * @param $notify
      * @return bool
@@ -129,9 +130,7 @@ class PaymentBehavior
      */
     public static function routinePayOrderRefund($orderNo, array $opt)
     {
-        $refundDesc = isset($opt['desc']) ? $opt['desc'] : '';
-        $res = MiniProgramService::payOrderRefund($orderNo,$opt);//2.5.36
-//        $res = RoutineRefund::doRefund($opt['pay_price'],$opt['refund_price'],$orderNo,'',$orderNo,$refundDesc);
+         return MiniProgramService::payOrderRefund($orderNo,$opt);//2.5.36
     }
 
     /**
diff --git a/extend/behavior/wechat/UserBehavior.php b/extend/behavior/wechat/UserBehavior.php
index 83ab904a..7fd09c49 100644
--- a/extend/behavior/wechat/UserBehavior.php
+++ b/extend/behavior/wechat/UserBehavior.php
@@ -37,6 +37,9 @@ class UserBehavior
             WechatUser::edit($wechatInfo,$wechatInfo['openid'],'openid');
             User::updateWechatUser($wechatInfo,WechatUser::openidToUid($wechatInfo['openid']));
         }else{
+            if(isset($wechatInfo['subscribe_scene'])) unset($wechatInfo['subscribe_scene']);
+            if(isset($wechatInfo['qr_scene'])) unset($wechatInfo['qr_scene']);
+            if(isset($wechatInfo['qr_scene_str'])) unset($wechatInfo['qr_scene_str']);
             $wechatInfo = WechatUser::set($wechatInfo);
             User::setWechatUser($wechatInfo);
         }