Skip to content

M
my-yaf-project
Commit b130e379 authored by christ's avatar christ
Browse files
Options

ccw

parent 1d6ceb48
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 14 deletions
application/models/Business/Goods/GoodsCommonService.php
View file @ b130e379
...@@ -64,6 +64,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -64,6 +64,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
//获得列表 //获得列表
if($datas = $goodsDao->getList(implode($where, ' and '), $this->goodsStorageField)) { if($datas = $goodsDao->getList(implode($where, ' and '), $this->goodsStorageField)) {
foreach ($datas as $key=>$val) { foreach ($datas as $key=>$val) {
$datas[$key]['goodsImage']=\Our\ImageUtil::getGoodsImgUrl($val['goodsImage'],\Our\ApiConst::goodsSmallSize);
$datas[$key]['goodsAttr'] = $goodsDao->getFormatGoodsAttr($val['goodsAttr']); $datas[$key]['goodsAttr'] = $goodsDao->getFormatGoodsAttr($val['goodsAttr']);
} }
} }
......
application/models/Business/Order/RefundService.php
View file @ b130e379
...@@ -875,10 +875,8 @@ class RefundServiceModel extends \Business\AbstractModel ...@@ -875,10 +875,8 @@ class RefundServiceModel extends \Business\AbstractModel
if(!empty($refundReturn['picInfo'])){ if(!empty($refundReturn['picInfo'])){
$refundReturn['picInfo'] = $refundReturnDao->getRefundPics($refundReturn['picInfo']['buyer']); $refundReturn['picInfo'] = $refundReturnDao->getRefundPics($refundReturn['picInfo']['buyer']);
} }
$refundReturn['couponAmount'] = ($order['goodsAmount'] + $order['shippingFee']) - $order['orderAmount'];//优惠券金额 $orderExtent=$orderDao->getClienOrderCommon($order);
$refundReturn['orderAmount'] = $order['orderAmount'] ; $refundReturn=array_merge($refundReturn,$orderExtent);
$refundReturn['goodsAmount']=$order['goodsAmount'];
$refundReturn['shippingFee']=$order['shippingFee'];
// $value['orderAmount'] = $value['orderAmount']; // $value['orderAmount'] = $value['orderAmount'];
$refundReturn['reciverInfo'] = unserialize($this->orderCommon['reciverInfo']); $refundReturn['reciverInfo'] = unserialize($this->orderCommon['reciverInfo']);
if ($refundReturn['refundType'] == ApiConst::refundTypeGoods) { if ($refundReturn['refundType'] == ApiConst::refundTypeGoods) {
......
conf/application.ini
View file @ b130e379
...@@ -284,31 +284,31 @@ push.open=1 ...@@ -284,31 +284,31 @@ push.open=1
[ccwdevelop : common] [ccwdevelop : common]
; 数据库配置 ; 数据库配置
resources.database.params.driver = "pdo_mysql" resources.database.params.driver = "pdo_mysql"
resources.database.params.hostname = "192.168.80.18" resources.database.params.hostname = "127.0.0.1"
resources.database.params.port = 3306 resources.database.params.port = 3306
resources.database.params.database = "qmcs" resources.database.params.database = "qmcs"
resources.database.params.username = "root" resources.database.params.username = "root"
resources.database.params.password = "123456" resources.database.params.password = "root"
resources.database.params.charset = "UTF8" resources.database.params.charset = "UTF8"
resources.database.params.driver_options.1002 = "SET NAMES utf8" resources.database.params.driver_options.1002 = "SET NAMES utf8"
; 从库配置 ; 从库配置
resources.database.slave.params.driver = "pdo_mysql" resources.database.slave.params.driver = "pdo_mysql"
resources.database.slave.params.hostname = "192.168.80.18" resources.database.slave.params.hostname = "127.0.0.1"
resources.database.slave.params.port = 3306 resources.database.slave.params.port = 3306
resources.database.slave.params.database = "qmcs" resources.database.slave.params.database = "qmcs"
resources.database.slave.params.username = "root" resources.database.slave.params.username = "root"
resources.database.slave.params.password = "123456" resources.database.slave.params.password = "root"
resources.database.slave.params.charset = "UTF8" resources.database.slave.params.charset = "UTF8"
resources.database.slave.params.driver_options.1002 = "SET NAMES utf8" resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
; 从库配置 ; 从库配置
resources.database.drawSource.params.driver = "pdo_mysql" resources.database.drawSource.params.driver = "pdo_mysql"
resources.database.drawSource.params.hostname = "192.168.80.18" resources.database.drawSource.params.hostname = "127.0.0.1"
resources.database.drawSource.params.port = 3306 resources.database.drawSource.params.port = 3306
resources.database.drawSource.params.database = "drawSource" resources.database.drawSource.params.database = "drawSource"
resources.database.drawSource.params.username = "root" resources.database.drawSource.params.username = "root"
resources.database.drawSource.params.password = "123456" resources.database.drawSource.params.password = "root"
resources.database.drawSource.params.charset = "UTF8" resources.database.drawSource.params.charset = "UTF8"
resources.database.drawSource.params.driver_options.1002 = "SET NAMES utf8" resources.database.drawSource.params.driver_options.1002 = "SET NAMES utf8"
...@@ -324,10 +324,10 @@ resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8" ...@@ -324,10 +324,10 @@ resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
password.key='~!@#$`1234qwertasdfgzxcvb'; password.key='~!@#$`1234qwertasdfgzxcvb';
redis.database.params.host = "127.0.0.1" redis.database.params.host = "192.168.1.201"
redis.database.params.port = "6379" redis.database.params.port = "6379"
redis.database.params.prefix = "qm_" redis.database.params.prefix = "qm_"
redis.database.params.password = "23456ertyu" redis.database.params.password = ""
out.config="/data/config"; out.config="/data/config";
;锁文件 ;锁文件
...@@ -336,8 +336,8 @@ out.locks="/data/locks"; ...@@ -336,8 +336,8 @@ out.locks="/data/locks";
;redis.database.params.password = "test" ;redis.database.params.password = "test"
;推送配置 ;推送配置
push.clientHost="ws://192.168.80.18:9502" push.clientHost="ws://192.168.1.201:9502"
push.host="192.168.80.18" push.host="192.168.1.201"
push.port="9503" push.port="9503"
push.open=1 push.open=1
push.user.service.id=293 push.user.service.id=293
......
public/clienttest/shopkeeper/warning.php 0 → 100644
View file @ b130e379
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>简单的html5 File测试 for pic2base64</title>
<style>
</style>
</head>
<body>
<form action="/client/shopkeeper/warning" method="post">
用户登录状态key:<input name="data[key]" value="91d068d63d3658922ed683e8969c8036"/><br />
<p id="img_area"></p>
<input type="submit" value="提交">
</form>
</body>
</html>
\ No newline at end of file
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