From a4e9e58a140989daf94fbdb9f02860b43f0d7bb7 Mon Sep 17 00:00:00 2001 From: samoye <849688611@qq.com> Date: Fri, 7 Dec 2018 10:37:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=94=80?= =?UTF-8?q?=E6=97=B6=E4=BA=8C=E7=BA=A7=E6=8E=A8=E5=B9=BF=E4=BA=BA=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=8E=B7=E5=BE=97=E5=A5=96=E5=8A=B1=E9=87=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E6=BA=90=E4=BB=A3=E7=A0=81=E4=B8=AD=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=BA=8C=E7=BA=A7=E8=BF=94=E4=BD=A3=E6=AF=94=E4=BE=8B?= =?UTF-8?q?=E6=97=B6=E5=AD=97=E6=AE=B5=E5=90=8D=E4=B8=8E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=AD=97=E6=AE=B5=E5=90=8D=E4=B8=8D=E7=AC=A6=E5=90=88?= =?UTF-8?q?=EF=BC=88=20store=5Fbrokerage=5Fratio=5Ftwo=EF=BC=89=EF=BC=8C?= =?UTF-8?q?=E8=87=B4=E4=BD=BF=E5=8F=96=E5=87=BA=E7=9A=84=E6=AF=94=E4=BE=8B?= =?UTF-8?q?=E4=B8=BA0,=E4=BA=8C=E7=BA=A7=E5=88=86=E9=94=80=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=EF=BC=8C=E8=BF=9B?= =?UTF-8?q?=E8=80=8C=E5=AF=BC=E8=87=B4=E4=BA=86=E4=BA=8C=E7=BA=A7=E5=88=86?= =?UTF-8?q?=E9=94=80=E4=BA=BA=E6=97=A0=E6=B3=95=E5=BE=97=E5=88=B0=E4=BD=A3?= =?UTF-8?q?=E9=87=91=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E4=B8=BA?= =?UTF-8?q?=EF=BC=88store=5Fbrokerage=5Ftwo=EF=BC=89=EF=BC=8C=E4=B8=8E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AF=B9=E5=BA=94=E5=8D=B3=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/routine/model/user/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/routine/model/user/User.php b/application/routine/model/user/User.php index 8913faea..e339374e 100644 --- a/application/routine/model/user/User.php +++ b/application/routine/model/user/User.php @@ -131,7 +131,7 @@ class User extends ModelBasic if($storeBrokerageStatu == 1){ if(!User::be(['uid'=>$userInfoTwo['spread_uid'],'is_promoter'=>1])) return true; } - $brokerageRatio = (SystemConfigService::get('store_brokerage_ratio_two') ?: 0)/100; + $brokerageRatio = (SystemConfigService::get('store_brokerage_two') ?: 0)/100; if($brokerageRatio <= 0) return true; $cost = isset($orderInfo['cost']) ? $orderInfo['cost'] : 0;//成本价 if($cost > $orderInfo['pay_price']) return true;//成本价大于支付价格时直接返回 From 9864878de11fd44f73f6565e6955ac51b46116a3 Mon Sep 17 00:00:00 2001 From: samoye <849688611@qq.com> Date: Fri, 7 Dec 2018 10:39:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=AC=E4=BC=97?= =?UTF-8?q?=E5=8F=B7=E6=97=A0=E6=B3=95=E4=BA=8C=E7=BA=A7=E5=88=86=E9=94=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E5=85=AC=E4=BC=97=E5=8F=B7User=E6=A8=A1?= =?UTF-8?q?=E5=9E=8Bl=E7=BC=BA=E5=B0=91=E4=BA=86=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E5=88=86=E9=94=80=E7=9A=84=E5=87=BD=E6=95=B0=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8D=B3=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/wap/model/user/User.php | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/application/wap/model/user/User.php b/application/wap/model/user/User.php index 04915ec8..19f0fef4 100644 --- a/application/wap/model/user/User.php +++ b/application/wap/model/user/User.php @@ -110,6 +110,29 @@ class User extends ModelBasic $res2 = self::bcInc($userInfo['spread_uid'],'now_money',$brokeragePrice,'uid'); $res = $res1 && $res2; self::checkTrans($res); + if(res) self::backOrderBrokerageTwo($orderInfo); + return $res; + } + public static function backOrderBrokerageTwo($orderInfo){ + $userInfo = User::getUserInfo($orderInfo['uid']); + $userInfoTwo = User::getUserInfo($userInfo['spread_uid']); + if(!$userInfoTwo || !$userInfoTwo['spread_uid']) return true; + $storeBrokerageStatu = SystemConfigService::get('store_brokerage_statu') ? : 1;//获取后台分销类型 + if($storeBrokerageStatu == 1){ + if(!User::be(['uid'=>$userInfoTwo['spread_uid'],'is_promoter'=>1])) return true; + } + $brokerageRatio = (SystemConfigService::get('store_brokerage_ratio_two') ?: 0)/100; + if($brokerageRatio <= 0) return true; + $cost = isset($orderInfo['cost']) ? $orderInfo['cost'] : 0;//成本价 + if($cost > $orderInfo['pay_price']) return true;//成本价大于支付价格时直接返回 + $brokeragePrice = bcmul(bcsub($orderInfo['pay_price'],$cost,2),$brokerageRatio,2); + if($brokeragePrice <= 0) return true; + $mark = '二级推广人'.$userInfo['nickname'].'成功消费'.floatval($orderInfo['pay_price']).'元,奖励推广佣金'.floatval($brokeragePrice); + self::beginTrans(); + $res1 = UserBill::income('获得推广佣金',$userInfoTwo['spread_uid'],'now_money','brokerage',$brokeragePrice,$orderInfo['id'],0,$mark); + $res2 = self::bcInc($userInfoTwo['spread_uid'],'now_money',$brokeragePrice,'uid'); + $res = $res1 && $res2; + self::checkTrans($res); return $res; } From ae83bae74c6f8f33a156ca7b50da192bdc0957f1 Mon Sep 17 00:00:00 2001 From: samoye <849688611@qq.com> Date: Fri, 7 Dec 2018 10:47:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E6=97=B6=E6=8A=A5=E5=87=BA=E7=9A=84illegal=20offset=E9=94=99?= =?UTF-8?q?=E8=AF=AF=20=E7=94=A8=E4=BA=8E=E5=AD=98=E6=94=BE=E7=AD=BE?= =?UTF-8?q?=E5=90=8D=E7=9A=84=E4=B8=B4=E6=97=B6=E6=95=B0=E7=BB=84$tem?= =?UTF-8?q?=E4=B8=8E=E8=BF=94=E5=9B=9E=E7=9A=84$data=E5=BA=94=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E4=B8=BAarray=E8=80=8C=E4=B8=8D=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E4=B8=BA=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/service/RoutineService.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extend/service/RoutineService.php b/extend/service/RoutineService.php index 0896c231..1285691b 100644 --- a/extend/service/RoutineService.php +++ b/extend/service/RoutineService.php @@ -65,13 +65,13 @@ class RoutineService{ $array = self::xml($xml);//全要大写 if($array['RETURN_CODE'] == 'SUCCESS' && $array['RESULT_CODE'] == 'SUCCESS'){ $time = time(); - $tmp='';//临时数组用于签名 + $tmp=array();//临时数组用于签名 $tmp['appId'] = $appid; $tmp['nonceStr'] = $nonce_str; $tmp['package'] = 'prepay_id='.$array['PREPAY_ID']; $tmp['signType'] = 'MD5'; $tmp['timeStamp'] = "$time"; - + $data=array(); $data['state'] = 1; $data['timeStamp'] = "$time";//时间戳 $data['nonceStr'] = $nonce_str;//随机字符串 @@ -80,6 +80,7 @@ class RoutineService{ $data['paySign'] = self::sign($tmp);//签名,具体签名方案参见微信公众号支付帮助文档; $data['out_trade_no'] = $out_trade_no; }else{ + $data=array(); $data['state'] = 0; $data['text'] = "错误"; $data['RETURN_CODE'] = $array['RETURN_CODE']; From 5b52a0aa7763a0c2ced149288ff07732e7e517db Mon Sep 17 00:00:00 2001 From: samoye <849688611@qq.com> Date: Fri, 7 Dec 2018 11:33:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20crmeb.sql=E4=B8=AD?= =?UTF-8?q?=E7=9A=84eb=5Fstore=5Fproduct=E8=A1=A8=E4=B8=ADslider=5Fimage?= =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=9E=8B=EF=BC=8C=E8=BF=9B=E8=80=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BA=86=E4=B8=8A=E4=BC=A0=E5=95=86=E5=93=81=E5=A4=9A?= =?UTF-8?q?=E5=BC=A0=E8=BD=AE=E6=92=AD=E5=9B=BE=E5=90=8E=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=8A=A5=E9=94=99=20=E5=8E=9F=E6=9C=89eb=5Fstore=5Fproduct?= =?UTF-8?q?=E8=A1=A8=E4=B8=ADslider=5Fimage=E7=9A=84=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=BAvarchar(512)=EF=BC=8C=E5=AF=BC=E8=87=B4=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=A4=9A=E5=BC=A0=E8=BD=AE=E6=92=AD=E5=9B=BE=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=86=85=E5=AE=B9=E9=95=BF=E5=BA=A6=E8=B6=85=E8=BF=87?= =?UTF-8?q?=E4=BA=86512=EF=BC=8C=E4=BD=BF=E5=BE=97=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=A2=AB=E6=88=AA=E5=8F=96=EF=BC=8C=E8=87=B4?= =?UTF-8?q?=E4=BD=BF=E5=9C=A8=E4=B8=8A=E4=BC=A0=E5=A4=9A=E5=BC=A0=E8=BD=AE?= =?UTF-8?q?=E6=92=AD=E5=9B=BE=E5=90=8E=E5=86=8D=E7=82=B9=E5=87=BB=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=95=86=E5=93=81=E6=8A=A5=E9=94=99=EF=BC=88=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E6=98=AF=E5=9B=A0=E4=B8=BAjson=5Fdecode=E7=9A=84?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=BAnull=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/install/crmeb.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/install/crmeb.sql b/public/install/crmeb.sql index f6fe11fa..64c87c87 100644 --- a/public/install/crmeb.sql +++ b/public/install/crmeb.sql @@ -614,7 +614,7 @@ CREATE TABLE `eb_store_product` ( `id` mediumint(11) NOT NULL AUTO_INCREMENT COMMENT '商品id', `mer_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '商户Id(0为总后台管理员创建,不为0的时候是商户后台创建)', `image` varchar(128) NOT NULL COMMENT '商品图片', - `slider_image` varchar(512) NOT NULL COMMENT '轮播图', + `slider_image` text NOT NULL COMMENT '轮播图', `store_name` varchar(128) NOT NULL COMMENT '商品名称', `store_info` varchar(256) NOT NULL COMMENT '商品简介', `keyword` varchar(256) NOT NULL COMMENT '关键字',