Skip to content

M
my-yaf-project
Commit f02c4297 authored by liuyuzhen's avatar liuyuzhen
Browse files
Options

Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

parents 5bd11a3b 91d20a7d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 12 deletions
application/library/Our/ApiConst.php
View file @ f02c4297
......@@ -198,6 +198,8 @@ class ApiConst
const refundSuccess = 1;
const refundFail = 0;
const isNotSuccessRefund=0;
const refundCompleted=3;
//是否收到货
const shippingOver = 1;
......@@ -419,6 +421,9 @@ class ApiConst
const minus = 0;
const plus = 1;
const set = 2;
//桌面最新版本
const clietnAppversion='1.0.1';
//微信小程序是否发布
const isWxPublish = 0;
......
application/models/Business/Common/SettingService.php
View file @ f02c4297
......@@ -2,6 +2,7 @@
namespace Business\Common;
use Our\ApiConst;
use Our\Common;
use Our\NameConst;
......@@ -24,10 +25,12 @@ class SettingServiceModel extends \Business\AbstractModel{
*/
public function getAppVersion(){
$settingDAO = \DAO\SettingModel::getInstance();
$version = $settingDAO->getListCache(array('app_version'));
$version=array();
$version['app_version'] = ApiConst::clietnAppversion;
//$version = $settingDAO->getListCache(array('app_version'));
$updateUrl=\Bootstrap::getUrlIniConfig('ossHost');
$fileName='/'.NameConst::refund;
$fileName='/'.NameConst::clientUpdateUrl;
$updateUrl=$updateUrl.'/'.$fileName;
return array('version'=>$version['app_version'],'updateUrl'=>$updateUrl);
}
......
application/models/Business/Order/RefundService.php
View file @ f02c4297
......@@ -210,6 +210,21 @@ class RefundServiceModel extends \Business\AbstractModel
$refundReturnDao->db->doRollback();
return false;
}
public function makeRefund($storeId,$refundId){
$refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
$returnDetail=$refundReturnDao->findByRefundId($refundId);
if($returnDetail['storeId']!=$storeId){
ErrorModel::throwException(CodeConfigModel::notExistRefund);
}$updateData=array();
$updateData['is_suc_refund']=ApiConst::refundSuccess;
$res=$refundReturnDao->update(array('refund_id'=>$refundId), $updateData);
if($res!==false){
return true;
}
return false;
}
/**
* 退货审核页
......@@ -290,6 +305,7 @@ class RefundServiceModel extends \Business\AbstractModel
if ($refund_array['seller_state'] == '2' && !$isGiveUp) {
$refund_array['return_type'] = '2';//退货类型:1为不用退货,2为需要退货
$refund_array['goods_state']=2;
$refund_array['refund_state']=ApiConst::refundStateProccess;
} elseif ($refund_array['seller_state'] == '3') {
$refund_array['refund_state'] = ApiConst::refundStateComplete;//状态:1为处理中,2为待管理员处理,3为已完成
......@@ -325,12 +341,11 @@ class RefundServiceModel extends \Business\AbstractModel
// showDialog('refund_state_name',$reload,'error');
return false;
}
}else{
if(!in_array($payment_type,array(0,2))){
$refund_array['refund_state']=ApiConst::refundStateProccess;
}
}
}
if(in_array($payment_type,array(0,2))){
$refund_array['refund_state']=ApiConst::refundStateProccess;
}
}
$refund_array['refund_amount']=$refundAmount;
$state = $refundReturnDao->update($condition, $refund_array);
......@@ -492,7 +507,7 @@ class RefundServiceModel extends \Business\AbstractModel
ErrorModel::throwException(CodeConfigModel::refundAddPointsLogError);
}
}
$refund_array['refund_state'] = ApiConst::platProccess; //状态:1为处理中,2为待管理员处理,3为已完成
$refund_array['refund_state'] = ApiConst::refundStateProccess; //状态:1为处理中,2为待管理员处理,3为已完成
$state = $refundReturnDao->editRefundReturn($whereRefund, $refund_array);
if($state){ //退款记录成功
......@@ -525,6 +540,8 @@ class RefundServiceModel extends \Business\AbstractModel
$updateData = array('is_suc_refund'=>1,'gmt_update'=>TIMESTAMP);
}
}
}else{
$updateData = array('is_suc_refund'=>ApiConst::zero,'gmt_update'=>TIMESTAMP,'seller_state'=>$refund_array['seller_state'],'refund_state'=>ApiConst::refundStateProccess);
}
$res=$refundReturnDao->update(array('refund_id'=>$refund['refund_id']), $updateData);
if(!$res){
......@@ -748,6 +765,11 @@ class RefundServiceModel extends \Business\AbstractModel
if($value['goodsState']>ApiConst::goodsStateWaitRecieve){
$value['shippingOver']=ApiConst::shippingOver;
}
if($value['isSucRefund']==ApiConst::isNotSuccessRefund && ($value['sellerState']==ApiConst::refundSellerAgree || $value['platformState']==ApiConst::platAgree) ){
$value['markRefundButton']=ApiConst::one;
}else{
$value['markRefundButton']=ApiConst::zero;;
}
unset($value['goodsSpec']);
// unset($value['picInfo']);
}
......@@ -992,9 +1014,9 @@ class RefundServiceModel extends \Business\AbstractModel
);
$refundCondition = $orderInfo['refundCondition'] ? unserialize($orderInfo['refundCondition']) : array();
$returnData['needShippingFee'] = $orderInfo['needShippingFee'];
if($orderInfo['shippingType']==ApiConst::bySelf){
// if($orderInfo['shippingType']==ApiConst::bySelf){
$returnData['needShippingFee']=ApiConst::zero;
}
// }
if ($orderInfo['paymentTime']) {
$orderConfirmUtil = \Order\OrderConfirmUtil::getInstance();
......@@ -1071,6 +1093,9 @@ class RefundServiceModel extends \Business\AbstractModel
$orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
$orderInfo = $orderDao->findByMemberIdAndOrderId($memberId, $refund['orderId'], $this->orderField);
$storeDao=\DAO\StoreModel::getInstance();
if($refund['refundType']==ApiConst::refundTypeGoods){
$refund['refundAmount']-=$orderInfo['needShippingFee'];
}
$whereRefund['goods_id']=$refund['goodsId'];
$whereRefund['buyer_id']=$memberId;
$whereRefund['order_id']=$orderInfo['orderId'];
......
application/models/Business/Store/StoreService.php
View file @ f02c4297
......@@ -198,7 +198,7 @@ class StoreServiceModel extends \Business\AbstractModel{
if($param['sid']) {
$sale = \DAO\SaleModel::getInstance()->getOne(array('sale_id'=>$param['sid']),'sale_act_id,member_id');
if($sale) {
$sale_act = \DAO\SaleActivityModel::getInstance()->getOne(array('sale_act_id'=>$sale['sale_act_id'],'sale_act_state'=>1));
$sale_act = \DAO\SaleActivityModel::getInstance()->getOne(array('sale_act_id'=>$sale['sale_act_id'],'sale_act_state'=>1),'*');
if($sale_act && $sale_act['sale_start_date'] >= time() && $sale_act['sale_end_date'] <= time()){
\DAO\SaleMemberModel::getInstance()->insertOrUpdate(array('sale_id'=>$sale['member_id'],'sale_act_id'=>$sale['sale_act_id'],'member_id'=>$memberId,'store_id'=>$storeId));
\Redis\Db4\SaleActivityRedisModel::getInstance()->tableDel('storeId:'.$storeId);
......
application/models/DAO/Member.php
View file @ f02c4297
......@@ -116,9 +116,9 @@ class MemberModel extends \DAO\AbstractModel
public function saveInfo($data, $memberId)
{
$this->setDb(\Our\DbNameConst::masterDBConnectName);
if($data['member_name']){
/*if($data['member_name']){
$data['member_name'] = base64_encode($data['member_name']);
}
}*/
$result = $this->db->update($this->_tableName)->rows($data)->where(array('member_id' => $memberId))->execute();
if ($result!==false) {
$memberDb0Redis = \Redis\Db0\MemberRedisModel::getInstance();
......
application/models/DAO/Order/OrderGoods.php
View file @ f02c4297
......@@ -133,6 +133,7 @@ class OrderGoodsModel extends \DAO\AbstractModel {
if(!empty($storeId)){
// return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsCountByStoreId'), array(),array($storeId));
\Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$this, 'getOrderGoodsCountByStoreId'), array(),array($storeId));
}
return true;
}
......
application/models/DAO/Order/RefundReturn.php
View file @ f02c4297
......@@ -92,6 +92,7 @@ class RefundReturnModel extends \DAO\AbstractModel
public function update($where, $data)
{
$this->setDb(\Our\DbNameConst::masterDBConnectName);
$data['gmt_update']=TIMESTAMP;
return $this->db->update($this->_tableName)->where($where)->rows($data)->execute();
}
......
application/models/DAO/Store.php
View file @ f02c4297
......@@ -270,6 +270,7 @@ class StoreModel extends \DAO\AbstractModel
$orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
$orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
\Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$refundReturnDao, 'getList'), array(), array($storeId));
\Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array(), array($storeId));
\Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByRecIds'), array(), array($storeId));
\Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderDao, 'getList'), array(), array($storeId));
}
......@@ -286,6 +287,7 @@ class StoreModel extends \DAO\AbstractModel
if(!empty($storeId)){
\Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$this, 'getList'), array(), array($storeId));
\Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$qmDeliveryManLogDao, 'getList'), array(), array($storeId));
}
if(!empty($orderId)){
$orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
......
application/modules/Client/controllers/Shopkeeper.php
View file @ f02c4297
......@@ -268,6 +268,14 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
}
//标记为已退款
public function makeRefundAction(){
$refundService=\Business\Order\RefundServiceModel::getInstance();
if( $refundService->makeRefund($this->storeId,$this->req['data']['refundId'])){
$this->success('操作成功');
};
ErrorModel::throwException(CodeConfigModel::commonError);
}
/**
* 拒绝退款
*/
......
jpush.log 0 → 100644
View file @ f02c4297
Send POST https://api.jpush.cn/v3/push, body:{"platform":"all","audience":{"alias":["433"]},"notification":{"alert":"tesetTitle","android":{"title":"tesetTitle","extras":{"toId":433},"alert":"testMessage"},"ios":{"alert":"testMessage","sound":"sound.caf","category":"shenbd","extras":{"toId":433},"badge":"+1"}},"message":{"msg_content":"testMessage","title":"tesetTitle","extras":{"toId":433}},"options":{"sendno":886299650,"apns_production":false}}, times:1
Send POST https://api.jpush.cn/v3/push, body:{"platform":"all","audience":{"alias":["433"]},"notification":{"alert":"tesetTitle","android":{"title":"tesetTitle","extras":{"toId":433},"alert":"testMessage"},"ios":{"alert":"testMessage","sound":"sound.caf","category":"shenbd","extras":{"toId":433},"badge":"+1"}},"message":{"msg_content":"testMessage","title":"tesetTitle","extras":{"toId":433}},"options":{"sendno":1332802149,"apns_production":true}}, times:1
public/service/useragreement.html 0 → 100644
View file @ f02c4297
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment