优惠券相关修改

application/library/Our/DescribeConst.php

@@ -106,7 +106,7 @@ class DescribeConst
     const applySuccess = '申请成功';
 
     const noLimitCoupon = '无门槛';
-    const specialCoupon = '指订券';
+    const specialCoupon = '指定券';
     const giftCoupon = '礼品券';
 
     const couponFullAvailable = '满{0}可用';

application/models/Business/Coupon/CouponService.php

@@ -42,10 +42,10 @@ class CouponServiceModel extends \Business\AbstractModel{
                         $orderAmount = intval($coupon['order_amount']);
                         if($coupon['type'] == \Our\ApiConst::noLimitCoupon){//无门槛优惠券
                             $temp['type'] = \Our\ApiConst::noLimitCouponType;
-                            $temp['title'] = $coupon['cash_money'];
+                            $temp['title'] = intval($coupon['cash_money']);
                             $temp['subTitle'] = \Our\DescribeConst::noLimitCoupon;
                         }else if($coupon['coupon_type'] == \Our\ApiConst::fullMinusCouponType){//满额减免券
-                            $temp['title'] = $coupon['cash_money'];
+                            $temp['title'] = intval($coupon['cash_money']);
                             $temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullAvailable,$orderAmount);
                         }else if($coupon['coupon_type'] == \Our\ApiConst::discountCouponType){
                             $temp['title'] = $coupon['discount'];
@@ -99,7 +99,7 @@ class CouponServiceModel extends \Business\AbstractModel{
         $result['type'] = intval($coupon['coupon_type']);
         $result['couponId'] = intval($coupon['id']);
         if($coupon['coupon_type'] == \Our\ApiConst::fullMinusCouponType){//满额减免券
-            $result['title'] = $coupon['cash_money'];
+            $result['title'] = intval($coupon['cash_money']);
             $result['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullAvailable,$orderAmount);
         }else if($coupon['coupon_type'] == \Our\ApiConst::discountCouponType){
             $result['title'] = $coupon['discount'];

application/models/DAO/Coupon/Coupon.php

@@ -241,9 +241,9 @@ class CouponModel extends \DAO\AbstractModel {
                 $temp['gift_goods_ids'] = isset($coupon['gift_goods_ids'])?$coupon['gift_goods_ids']:\Our\NameConst::emptyString;
                 $orderAmount = intval($coupon['order_amount']);
                 if($coupon['type'] == \Our\ApiConst::noLimitCoupon){//无门槛优惠券
-                    $temp['title'] = $coupon['cash_money'].\Our\DescribeConst::noLimitGoodsCouponName;
+                    $temp['title'] = intval($coupon['cash_money']).\Our\DescribeConst::noLimitGoodsCouponName;
                 }else if($coupon['coupon_type'] == \Our\ApiConst::fullMinusCouponType){//满额减免券
-                    $temp['title'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullAvailAble,$orderAmount,$coupon['cash_money']);
+                    $temp['title'] = \Our\Common::format(\Our\DescribeConst::couponTitleFullAvailAble,$orderAmount,intval($coupon['cash_money']));
                 }else if($coupon['coupon_type'] == \Our\ApiConst::discountCouponType){
                     $temp['title'] = \Our\Common::format(\Our\DescribeConst::couponFullDiscount,$orderAmount,$coupon['discount']);
                 }else if($coupon['coupon_type'] == \Our\ApiConst::fullForCouponCouponType){
@@ -275,10 +275,10 @@ class CouponModel extends \DAO\AbstractModel {
                 $orderAmount = intval($coupon['order_amount']);
                 if($coupon['type'] == \Our\ApiConst::noLimitCoupon){//无门槛优惠券
                     $temp['type'] = \Our\ApiConst::noLimitCouponType;
-                    $temp['title'] = $coupon['cash_money'];
+                    $temp['title'] = intval($coupon['cash_money']);
                     $temp['subTitle'] = \Our\DescribeConst::noLimitCoupon;
                 }else if($coupon['coupon_type'] == \Our\ApiConst::fullMinusCouponType){//满额减免券
-                    $temp['title'] = $coupon['cash_money'];
+                    $temp['title'] = intval($coupon['cash_money']);
                     $temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullAvailable,$orderAmount);
                 }else if($coupon['coupon_type'] == \Our\ApiConst::discountCouponType){
                     $temp['title'] = $coupon['discount'];

conf/application.ini

@@ -277,7 +277,7 @@ resources.database.params.hostname = "127.0.0.1"
 resources.database.params.port     = 3306
 resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
-resources.database.params.password = "123456"
+resources.database.params.password = "root"
 resources.database.params.charset  = "UTF8"
 resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
@@ -287,7 +287,7 @@ resources.database.slave.params.hostname = "127.0.0.1"
 resources.database.slave.params.port     = 3306
 resources.database.slave.params.database = "qmcs"
 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.driver_options.1002 = "SET NAMES utf8"
 
@@ -314,3 +314,48 @@ push.user.service.type=7
 elastic.master.host="192.168.1.201"
 elastic.master.port="9200"
 elastic.master.scheme="http";
+
+[lyz : common]
+; 数据库配置
+resources.database.params.driver   = "pdo_mysql"
+resources.database.params.hostname = "127.0.0.1"
+resources.database.params.port     = 3306
+resources.database.params.database = "qmcs"
+resources.database.params.username = "root"
+resources.database.params.password = "123456"
+resources.database.params.charset  = "UTF8"
+resources.database.params.driver_options.1002 = "SET NAMES utf8"
+
+; 从库配置
+resources.database.slave.params.driver   = "pdo_mysql"
+resources.database.slave.params.hostname = "127.0.0.1"
+resources.database.slave.params.port     = 3306
+resources.database.slave.params.database = "qmcs"
+resources.database.slave.params.username = "root"
+resources.database.slave.params.password = "123456"
+resources.database.slave.params.charset  = "UTF8"
+resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
+
+redis.database.params.host = "127.0.0.1"
+redis.database.params.port = "6379"
+redis.database.params.prefix = "qm_"
+;redis.database.params.password = "23456ertyu"
+
+out.config="/data/config";
+;锁文件
+out.locks="/data/locks";
+; redis配置
+
+;redis.database.params.password = "test"
+;推送配置
+push.clientHost="ws://192.168.80.134:9502"
+push.host="192.168.134.18"
+push.port="9503"
+push.open=1
+
+push.user.service.id=293
+push.user.service.type=7
+
+elastic.master.host="192.168.1.201"
+elastic.master.port="9200"
+elastic.master.scheme="http";

conf/url.ini

@@ -134,3 +134,20 @@ config.url.indexUrl="/www/local.qm.com/application/library/React"
 config.url.libary="/www/local.qm.com/application/library"
 ; 文件目录
 
+[lyz : common]
+; url相关配置
+config.url.resourcesHost = "http://local.qm.com"
+; 用户中心host
+config.url.userHost = ""
+
+; oss 域名
+config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+
+;推送域名
+config.url.pushHost="127.0.0.1:9503";
+
+
+config.url.convert="/usr/local/bin/wkhtmltoimage";
+config.url.indexUrl="/www/local.qm.com/application/library/React"
+config.url.libary="/www/local.qm.com/application/library"
+; 文件目录