|
|
@@ -91,6 +91,10 @@ class StoreOrderRepository extends BaseRepository
|
|
91
|
91
|
private $source;
|
|
92
|
92
|
private $merId;
|
|
93
|
93
|
|
|
|
94
|
+ const commercetrade_cash_integral = 'commercetrade_cash_integral'; // 商贸区:现金+积分
|
|
|
95
|
+ const commercetrade_cash_peking_bean = 'commercetrade_cash_peking_bean'; // 商贸区:现金+京豆
|
|
|
96
|
+ const commercetrade_cash = 'commercetrade_cash'; // 商贸区:现金
|
|
|
97
|
+
|
|
94
|
98
|
/**
|
|
95
|
99
|
* StoreOrderRepository constructor.
|
|
96
|
100
|
* @param StoreOrderDao $dao
|
|
|
@@ -2325,9 +2329,9 @@ class StoreOrderRepository extends BaseRepository
|
|
2325
|
2329
|
|
|
2326
|
2330
|
if ($is_commercetrade){
|
|
2327
|
2331
|
$cartInfo['list'][$_k]['fzone_paytype'] = [
|
|
2328
|
|
- ['type' => 'commercetrade_cash_integral', 'price' => $jcprice, 'other' => $jcjf1, "note" => "现金+积分"],
|
|
2329
|
|
- ['type'=>'commercetrade_peking_bean','price'=>$jcvr1,'other'=>$jcjd,"note"=>"现金+京豆"],
|
|
2330
|
|
- ['type' => 'commercetrade_cash', 'price' => $orderpri, 'other' => 0, "note" => "现金"]
|
|
|
2332
|
+ ['type' => self::commercetrade_cash_integral, 'price' => $jcprice, 'other' => $jcjf1, "note" => "现金+积分"],
|
|
|
2333
|
+ ['type'=>self::commercetrade_cash_peking_bean,'price'=>$jcprice,'other'=>$jcjd,"note"=>"现金+京豆"],
|
|
|
2334
|
+ ['type' => self::commercetrade_cash, 'price' => $orderpri, 'other' => 0, "note" => "现金"]
|
|
2331
|
2335
|
];
|
|
2332
|
2336
|
} else {
|
|
2333
|
2337
|
$cartInfo['list'][$_k]['fzone_paytype'] = [
|