stanley-king 4 년 전
부모
커밋
23b7f88929
4개의 변경된 파일6개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      data/config/dev/refill.ini.php
  2. 2 2
      data/config/prod/refill.ini.php
  3. 2 1
      document/refill.sql
  4. 1 1
      test/TestRefill.php

+ 1 - 1
data/config/dev/refill.ini.php

@@ -3,7 +3,7 @@
 
 $suhc_oil = ['name' => 'suhc','store_id' => 8,'card_type' => ['sinopec'],
     'amount' => [100 => ['goods_id' => 6226,'price' => 96.8],
-        200 => ['goods_id' => 6227,'price' => 197.6],
+        200 => ['goods_id' => 6227,'price' => 193.6],
         500 => ['goods_id' => 6228,'price' => 484],
         1000=> ['goods_id' => 6229,'price' => 968],
         2000=> ['goods_id' => 6230,'price' => 1976]],

+ 2 - 2
data/config/prod/refill.ini.php

@@ -2,10 +2,10 @@
 
 $suhc_oil = ['name' => 'suhc','store_id' => 7,'card_type' => ['sinopec'],
     'amount' => [100 => ['goods_id' => 6290,'price' => 96.8],
-        200 => ['goods_id' => 6291,'price' => 197.6],
+        200 => ['goods_id' => 6291,'price' => 193.6],
         500 => ['goods_id' => 6292,'price' => 484],
         1000=> ['goods_id' => 6293,'price' => 968],
-        2000=> ['goods_id' => 6294,'price' => 1976]],
+        2000=> ['goods_id' => 6294,'price' => 1936]],
     'period' => ['start' => '8:30','end' => '22:30'],'refill_type' => 'api'];
 $oil_providers = ['suhc' => $suhc_oil];
 $config['oil_providers'] = $oil_providers;

+ 2 - 1
document/refill.sql

@@ -42,7 +42,6 @@ create table lrlz_refill_order
     channel_name     varchar(32) charset latin1  null,
     mch_amount       decimal(10, 2)              null comment '充值机构花了多少钱',
     channel_amount   decimal(10, 2)              null comment '通道扣了多少钱',
-    jd_no            varchar(32) charset latin1  null comment '京东单号',
     ch_trade_no      varchar(48) charset latin1  null,
     order_time       int                         null,
     commit_time      int                         null,
@@ -55,3 +54,5 @@ create table lrlz_refill_order
 
 
 
+
+

+ 1 - 1
test/TestRefill.php

@@ -53,7 +53,7 @@ class TestRefill extends TestCase
         $params['vouchertype'] = '';
         $params['voucherurl'] = '';
         $params['tradeNo'] = '200649600557718888';
-        $ret = \refill\RefillFactory::instance()->notify('beixt',$params);
+        $ret = refill\RefillFactory::instance()->notify('beixt',$params);
     }
 
     public function testAddoil()