Merge pull request !183 from 赵世界/develop
This commit is contained in:
赵世界 2023-08-09 09:12:59 +00:00 committed by Gitee
commit 3227d5019e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 2 additions and 6 deletions

View File

@ -154,7 +154,6 @@ class BusinessOrderController extends Controller
->where('plat_id', Shop::$PLAT_KTT)
->pluck('id');
$builder = BusinessOrder::query()
->where('order_sn', 'PO-230728-287005797932723')
->with('items')
->whereIn('shop_id', $shopIds)
->filter();

View File

@ -18,10 +18,6 @@ class WayBillService
// 已下单过的订单不再下单
$contents = [];
foreach ($this->orders as $shopId => $order) {
// 花落测试;
if ($shopId !== 6) {
continue;
}
// 订单取消的情况暂不处理
$shop = $this->getShop($shopId);
$faceSheet = new FaceSheet();
@ -29,6 +25,7 @@ class WayBillService
foreach ($order as $item) {
[$sender, $orderInfo, $wpCode] = $this->prepareRequest($item, $shop);
$waybill = $this->saveWayBill($item, $shop);
if (empty($waybill->id)) {
$resp = $faceSheet->getWayBill($sender, $orderInfo, $wpCode);
if (isset($resp['pdd_waybill_get_response'])) {

View File

@ -26,7 +26,7 @@ class CreateShopSendersTable extends Migration
$table->string('district');
$table->string('detail');
$table->string('name')->nullable()->default('');
$table->integer('mobile')->nullable();
$table->string('mobile', 18)->nullable();
$table->integer('sort')->default(1);
$table->integer('status')->default(1);
$table->string('wp_code')->default('');