fe / YOHOBUYPC · Commits

Go to a project

Authored by 郝肖肖
Commit 6a01c502252efe6c9feab986f3c440f95811e79e 1 parent 328b91d4

修复 更改支付方式 锁单bug

Inline Side-by-side
Showing 6 changed files with 13 additions and 22 deletions
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 <div class="count"> 33 <div class="count">
34 {{#each list}} 34 {{#each list}}
35 <div class="mode" data-id="{{dataId}}" data-value="{{dataVal}}"> 35 <div class="mode" data-id="{{dataId}}" data-value="{{dataVal}}">
36 - <div id="{{idNum}}"></div> 36 + <div id="{{idNum}}" class="borer-tag"></div>
37 <img src="{{ico}}" alt="{{name}}" id="{{imgId}}"> 37 <img src="{{ico}}" alt="{{name}}" id="{{imgId}}">
38 </div> 38 </div>
39 {{/each}} 39 {{/each}}
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <div class="count"> 44 <div class="count">
45 {{# each entry}} 45 {{# each entry}}
46 <div class="mode" data-id="{{dataId}}" data-value="{{dataVal}}"> 46 <div class="mode" data-id="{{dataId}}" data-value="{{dataVal}}">
47 - <div id="{{idNum}}"></div> 47 + <div id="{{idNum}}" class="borer-tag"></div>
48 <img src="{{ico}}" alt="{{name}}" id="{{imgId}}"> 48 <img src="{{ico}}" alt="{{name}}" id="{{imgId}}">
49 </div> 49 </div>
50 {{/each}} 50 {{/each}}
@@ -15,7 +15,6 @@ var $ = require('yoho.jquery'), @@ -15,7 +15,6 @@ var $ = require('yoho.jquery'),
15 $payUrl = $('#payUrl').val(), 15 $payUrl = $('#payUrl').val(),
16 $modeData, 16 $modeData,
17 activeTab, 17 activeTab,
18 - showDiv,  
19 imgAlt, 18 imgAlt,
20 imgSrc, 19 imgSrc,
21 orderCode, 20 orderCode,
@@ -45,7 +44,6 @@ function choosed() { @@ -45,7 +44,6 @@ function choosed() {
45 $mode.eq(0).addClass('choose-type').show(); 44 $mode.eq(0).addClass('choose-type').show();
46 $mode.eq(0).find('div').addClass('choosed-tag'); 45 $mode.eq(0).find('div').addClass('choosed-tag');
47 } 46 }
48 -  
49 $btnty.attr('value', '前往' + $('#' + $chooseMoid).attr('alt')); 47 $btnty.attr('value', '前往' + $('#' + $chooseMoid).attr('alt'));
50 $showPayImg.attr('src', $('#' + $chooseMoid).attr('src')); 48 $showPayImg.attr('src', $('#' + $chooseMoid).attr('src'));
51 } 49 }
@@ -54,7 +52,6 @@ choosed(); @@ -54,7 +52,6 @@ choosed();
54 52
55 $mode.click(function() { 53 $mode.click(function() {
56 $modeData = $(this).data(); 54 $modeData = $(this).data();
57 - showDiv = $modeData.id;  
58 $showValue = $modeData.value; 55 $showValue = $modeData.value;
59 imgAlt = $('#' + $showValue).attr('alt'); 56 imgAlt = $('#' + $showValue).attr('alt');
60 imgSrc = $('#' + $showValue).attr('src'); 57 imgSrc = $('#' + $showValue).attr('src');
@@ -62,7 +59,7 @@ $mode.click(function() { @@ -62,7 +59,7 @@ $mode.click(function() {
62 $mode.removeClass('choose-type'); 59 $mode.removeClass('choose-type');
63 $(this).addClass('choose-type'); 60 $(this).addClass('choose-type');
64 $choseTag.removeClass('choosed-tag'); 61 $choseTag.removeClass('choosed-tag');
65 - $('#' + showDiv).addClass('choosed-tag'); 62 + $(this).find('.borer-tag').addClass('choosed-tag');
66 $btnty.attr('value', '前往' + imgAlt); 63 $btnty.attr('value', '前往' + imgAlt);
67 $showPayImg.attr('src', imgSrc); 64 $showPayImg.attr('src', imgSrc);
68 return false; 65 return false;
@@ -147,16 +147,14 @@ class PayModel @@ -147,16 +147,14 @@ class PayModel
147 if (isset($bankRecord['data']['bankCode']) && !empty($bankRecord['data']['bankCode'])) { 147 if (isset($bankRecord['data']['bankCode']) && !empty($bankRecord['data']['bankCode'])) {
148 $payRecord = $bankRecord['data']['bankCode']; 148 $payRecord = $bankRecord['data']['bankCode'];
149 } else { 149 } else {
150 - $payCode = $order['payment'] ?: $defaultPayType; 150 + $payCode = empty($order['payment']) ? $defaultPayType : $order['payment'];
151 //记录app上的支付方式 151 //记录app上的支付方式
152 $changeCodes = array( 152 $changeCodes = array(
153 19 => 21,// app上微信支付 153 19 => 21,// app上微信支付
154 22 => 21,// h5微信支付 154 22 => 21,// h5微信支付
155 - 18 => $defaultPayType// h5支付宝支付 155 + 18 => 2// h5支付宝支付
156 ); 156 );
157 - $platformCode = isset($changeCodes[$payCode]) && $changeCodes[$payCode] ? $changeCodes[$payCode] : $payCode;  
158 - $platformCodeList = array_keys($types);  
159 - $payRecord = in_array($platformCode, $platformCodeList) ? $platformCode : $defaultPayType; 157 + $payRecord = empty($changeCodes[$payCode]) ? $defaultPayType : $changeCodes[$payCode];
160 } 158 }
161 $result['payRecord'] = $payRecord; 159 $result['payRecord'] = $payRecord;
162 160
@@ -198,16 +196,14 @@ class PayModel @@ -198,16 +196,14 @@ class PayModel
198 $onePay = array(); 196 $onePay = array();
199 foreach ($pays as $code => $pay) { 197 foreach ($pays as $code => $pay) {
200 $onePay = array(); 198 $onePay = array();
201 - $onePay['dataId'] = $code; 199 + $onePay['dataId'] = $isBank ? 12 : $code;//支付宝支联为12
202 $onePay['dataVal'] = $isBank ? '12_' . $code : $code . '_platform'; 200 $onePay['dataVal'] = $isBank ? '12_' . $code : $code . '_platform';
203 $onePay['idNum'] = $code; 201 $onePay['idNum'] = $code;
204 $onePay['ico'] = $pay['ico']; 202 $onePay['ico'] = $pay['ico'];
205 $onePay['name'] = $pay['name']; 203 $onePay['name'] = $pay['name'];
206 $onePay['imgId'] = $onePay['dataVal']; 204 $onePay['imgId'] = $onePay['dataVal'];
207 -  
208 $result[] = $onePay; 205 $result[] = $onePay;
209 } 206 }
210 -  
211 return $result; 207 return $result;
212 } 208 }
213 209
@@ -150,16 +150,14 @@ class PaymentModel @@ -150,16 +150,14 @@ class PaymentModel
150 if (isset($bankRecord['data']['bankCode']) && !empty($bankRecord['data']['bankCode'])) { 150 if (isset($bankRecord['data']['bankCode']) && !empty($bankRecord['data']['bankCode'])) {
151 $payRecord = $bankRecord['data']['bankCode']; 151 $payRecord = $bankRecord['data']['bankCode'];
152 } else { 152 } else {
153 - $payCode = $order['payment'] ?: $defaultPayType; 153 + $payCode = empty($order['payment']) ? $defaultPayType : $order['payment'];
154 //记录app上的支付方式 154 //记录app上的支付方式
155 $changeCodes = array( 155 $changeCodes = array(
156 19 => 21,// app上微信支付 156 19 => 21,// app上微信支付
157 22 => 21,// h5微信支付 157 22 => 21,// h5微信支付
158 - 18 => $defaultPayType// h5支付宝支付 158 + 18 => 2// h5支付宝支付
159 ); 159 );
160 - $platformCode = isset($changeCodes[$payCode]) && $changeCodes[$payCode] ? $changeCodes[$payCode] : $payCode;  
161 - $platformCodeList = array_keys($types);  
162 - $payRecord = in_array($platformCode, $platformCodeList) ? $platformCode : $defaultPayType; 160 + $payRecord = empty($changeCodes[$payCode]) ? $defaultPayType : $changeCodes[$payCode];
163 } 161 }
164 $result['payRecord'] = $payRecord; 162 $result['payRecord'] = $payRecord;
165 163
@@ -202,7 +200,7 @@ class PaymentModel @@ -202,7 +200,7 @@ class PaymentModel
202 200
203 foreach ($pays as $code => $pay) { 201 foreach ($pays as $code => $pay) {
204 $onePay = array(); 202 $onePay = array();
205 - $onePay['dataId'] = $code; 203 + $onePay['dataId'] = $isBank ? 12 : $code;//支付宝支联为12
206 $onePay['dataVal'] = $isBank ? '12_' . $code : $code . '_platform'; 204 $onePay['dataVal'] = $isBank ? '12_' . $code : $code . '_platform';
207 $onePay['idNum'] = $code; 205 $onePay['idNum'] = $code;
208 $onePay['ico'] = $pay['ico']; 206 $onePay['ico'] = $pay['ico'];
@@ -26,7 +26,7 @@ class PayController extends WebAction @@ -26,7 +26,7 @@ class PayController extends WebAction
26 public function indexAction() 26 public function indexAction()
27 { 27 {
28 /* 判断用户是否登录 */ 28 /* 判断用户是否登录 */
29 - $uid = $this->getUid(true); 29 + $uid = $this->getUid();
30 if (!$uid) { 30 if (!$uid) {
31 $this->go( Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', SITE_MAIN))) ); 31 $this->go( Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', SITE_MAIN))) );
32 } 32 }
@@ -88,7 +88,7 @@ class PayController extends WebAction @@ -88,7 +88,7 @@ class PayController extends WebAction
88 $result = array('code' => 400, 'message' => '操作失败！'); 88 $result = array('code' => 400, 'message' => '操作失败！');
89 if ($this->isAjax()) { 89 if ($this->isAjax()) {
90 do { 90 do {
91 - $uid = $this->getUid(true); 91 + $uid = $this->getUid();
92 $orderCode = $this->post('orderCode', 0); 92 $orderCode = $this->post('orderCode', 0);
93 $paymentId = $this->post('paymentId', 0); 93 $paymentId = $this->post('paymentId', 0);
94 if (empty($orderCode) || empty($uid) || empty($paymentId)) { 94 if (empty($orderCode) || empty($uid) || empty($paymentId)) {