github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2025-12-17 06:52:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

调整钩子函数引用类

Browse Source
This commit is contained in:
liaofei 2019-05-10 09:34:12 +08:00
parent c2986bc9d3
commit ea64b80867
8 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extend/Api/Express.php
View File

@ -9,7 +9,7 @@ namespace Api;
use service\HttpService; use service\HttpService;
use service\SystemConfigService; use app\core\util\SystemConfigService;
class Express class Express
{ {

12
extend/behavior/admin/OrderBehavior.php
View File

@ -7,16 +7,9 @@
namespace behavior\admin; namespace behavior\admin;
use app\admin\model\routine\RoutineFormId;
use basic\ModelBasic;
use app\admin\model\user\User; use app\admin\model\user\User;
use app\admin\model\order\StoreOrder as AdminStoreOrder; use app\admin\model\order\StoreOrder as AdminStoreOrder;
use app\admin\model\user\UserAddress; use app\core\util\WechatTemplateService;
use app\admin\model\user\UserBill;
use app\admin\model\wechat\WechatUser;
use service\SystemConfigService;
use service\WechatTemplateService;
use service\RoutineTemplateService;
class OrderBehavior class OrderBehavior
{ {
@ -44,7 +37,6 @@ class OrderBehavior
*/ */
public static function storeProductOrderDeliveryGoodsAfter($data,$oid){ public static function storeProductOrderDeliveryGoodsAfter($data,$oid){
AdminStoreOrder::orderPostageAfter($oid,$data); AdminStoreOrder::orderPostageAfter($oid,$data);
// AdminStoreOrder::sendOrderGoods($oid,$data);
} }
/** /**
@ -84,7 +76,7 @@ class OrderBehavior
* $oid string store_order表中的id * $oid string store_order表中的id
*/ */
public static function storeProductOrderRefundNAfter($data,$oid){ public static function storeProductOrderRefundNAfter($data,$oid){
AdminStoreOrder::refundNoPrieTemplate($oid,$data);
} }
/** /**
* 线下付款 * 线下付款

14
extend/behavior/routine/StoreProductBehavior.php
View File

@ -8,14 +8,14 @@
namespace behavior\routine; namespace behavior\routine;
use app\routine\model\store\StoreOrder; use app\ebapi\model\store\StoreOrder;
use app\routine\model\routine\RoutineTemplate; use app\core\model\routine\RoutineTemplate;
use app\routine\model\user\User; use app\core\model\user\User;
use app\routine\model\user\WechatUser; use app\ebapi\model\user\WechatUser;
use app\routine\model\user\UserAddress; use app\ebapi\model\user\UserAddress;
use app\admin\model\order\StoreOrder as StoreOrderAdminModel; use app\admin\model\order\StoreOrder as StoreOrderAdminModel;
use service\SystemConfigService; use app\core\util\SystemConfigService;
use service\WechatTemplateService; use app\core\util\WechatTemplateService;
class StoreProductBehavior class StoreProductBehavior
{ {

4
extend/behavior/wap/StoreProductBehavior.php
View File

@ -17,8 +17,8 @@ use app\wap\model\user\UserBill;
use app\wap\model\user\WechatUser; use app\wap\model\user\WechatUser;
use basic\ModelBasic; use basic\ModelBasic;
use app\admin\model\order\StoreOrder as StoreOrderAdminModel; use app\admin\model\order\StoreOrder as StoreOrderAdminModel;
use service\SystemConfigService; use app\core\util\SystemConfigService;
use service\WechatTemplateService; use app\core\util\WechatTemplateService;
class StoreProductBehavior class StoreProductBehavior
{ {

2
extend/behavior/wechat/MessageBehavior.php
View File

@ -12,7 +12,7 @@ use app\admin\model\wechat\WechatMessage;
use app\admin\model\wechat\WechatReply; use app\admin\model\wechat\WechatReply;
use app\wap\model\user\WechatUser; use app\wap\model\user\WechatUser;
use service\HookService; use service\HookService;
use service\QrcodeService; use app\core\util\QrcodeService;
/** /**
* 用户消息行为 * 用户消息行为

11
extend/behavior/wechat/PaymentBehavior.php
View File

@ -9,12 +9,12 @@ namespace behavior\wechat;
use app\admin\model\wechat\WechatMessage; 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\store\StoreOrder as StoreOrderWapModel;
use app\wap\model\user\UserRecharge; use app\wap\model\user\UserRecharge;
use service\HookService; use service\HookService;
use service\WechatService; use app\core\util\WechatService;
use service\MiniProgramService; use app\core\util\MiniProgramService;
class PaymentBehavior class PaymentBehavior
{ {
@ -70,6 +70,7 @@ class PaymentBehavior
/** /**
* 商品订单支付成功后 小程序 * 商品订单支付成功后 小程序
*
* @param $orderId * @param $orderId
* @param $notify * @param $notify
* @return bool * @return bool
@ -129,9 +130,7 @@ class PaymentBehavior
*/ */
public static function routinePayOrderRefund($orderNo, array $opt) public static function routinePayOrderRefund($orderNo, array $opt)
{ {
$refundDesc = isset($opt['desc']) ? $opt['desc'] : ''; return MiniProgramService::payOrderRefund($orderNo,$opt);//2.5.36
$res = MiniProgramService::payOrderRefund($orderNo,$opt);//2.5.36
// $res = RoutineRefund::doRefund($opt['pay_price'],$opt['refund_price'],$orderNo,'',$orderNo,$refundDesc);
} }
/** /**

3
extend/behavior/wechat/UserBehavior.php
View File

@ -37,6 +37,9 @@ class UserBehavior
WechatUser::edit($wechatInfo,$wechatInfo['openid'],'openid'); WechatUser::edit($wechatInfo,$wechatInfo['openid'],'openid');
User::updateWechatUser($wechatInfo,WechatUser::openidToUid($wechatInfo['openid'])); User::updateWechatUser($wechatInfo,WechatUser::openidToUid($wechatInfo['openid']));
}else{ }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); $wechatInfo = WechatUser::set($wechatInfo);
User::setWechatUser($wechatInfo); User::setWechatUser($wechatInfo);
} }