|
@@ -28,7 +28,7 @@ class DouShopService extends Service
|
|
|
|
|
|
//------------------获取token
|
|
|
public function getToken($data){
|
|
|
- if(empty($data['shop_id'])) return [false, '店铺ID不能为空'];
|
|
|
+ if(empty($data['shop_id'])) return [false, '请选择店铺不能为空'];
|
|
|
|
|
|
$key = $this->appKey . $data['shop_id'] . self::RedisKey;
|
|
|
$token = Redis::get($key);
|
|
@@ -332,7 +332,7 @@ class DouShopService extends Service
|
|
|
$tmp['contract_fee'] = $value['order_amount'] / 100;
|
|
|
foreach ($value['product'] as $p){
|
|
|
if(! isset($product_map[$p['code']])) return [false, '产品编码:' . $p['code'] . '在系统中不存在或已被删除'];
|
|
|
- $tmp['product_total'] += $p['sum_amount'];
|
|
|
+ $tmp['product_total'] += $p['sum_amount'] / 100;
|
|
|
|
|
|
//产品子表
|
|
|
$product_tmp = $product_map[$p['code']] ?? [];
|
|
@@ -382,10 +382,8 @@ class DouShopService extends Service
|
|
|
$insert3 = [];
|
|
|
foreach ($last_insert_id as $key => $value){
|
|
|
if(isset($insert_detail_man[$key])) {
|
|
|
- foreach ($insert_detail_man[$key] as $val){
|
|
|
- $val['sales_order_id'] = $value;
|
|
|
- $insert3[] = $val;
|
|
|
- }
|
|
|
+ $insert_detail_man[$key]['sales_order_id'] = $value;
|
|
|
+ $insert3[] = $insert_detail_man[$key];
|
|
|
}
|
|
|
}
|
|
|
SalesOrderInfo::insert($insert3);
|