fix

jnby-pomme/数据组装dev.sql

-
+
@@ -64,7 +64,9 @@ FROM order_member_address addr
  ,`pay_number`, `pay_time`, `order_show`, `evaluation_status`, `new_status`, `remarks`, `create_time`, `update_time`, `pay_amount_all`
  ,`stock_decrease`, `clique_id`, `clique_member_id`, `deliver_store_id`, `delivery_type`, `store_code`, `clerk_code`, `trade_close_reason`, `order_version`,from_erp,`order_sequence`
  )
-  select  replace(uuid(), '-', '')  as order_id,oi.erp_order_id ,IFNULL(CONCAT('RE9',floor(UNIX_TIMESTAMP(oi.create_time))),oi.order_number) as order_number  ,members_view.enterprise_id, '-1' as brand_id  ,members_view.member_id,oi.mall_pro_all_price
+  select  replace(uuid(), '-', '')  as order_id,oi.erp_order_id
+  ,IFNULL (oi.order_number,CONCAT('RE999',floor(UNIX_TIMESTAMP(oi.create_time)))) as order_number
+  ,members_view.enterprise_id, '-1' as brand_id  ,members_view.member_id,oi.mall_pro_all_price
 ,oi.actual_freight, oi.actual_freight as mall_order_freight, oi.discount_amount,oi.discount_amount_info,oi.amount_payable_info
 ,oi.pay_amount, oi.pay_type,null as coupon_card_log_id ,oi.coupon_card_code,oi.get_points,oi.use_points,clerk.clerk_id,clerk.store_id_order as store_id,addr.member_address_id
 ,oi.address_info, addr.county_id as area_id,oi.buyer_name,oi.buyer_phone,logistics.`logistics_company_id`,oi.logistics_number,replace(uuid(), '-', '') as order_process_id ,oi.order_step

jnby-pomme/数据组装pro.sql

-
+
@@ -64,7 +64,9 @@ FROM order_member_address addr
  ,`pay_number`, `pay_time`, `order_show`, `evaluation_status`, `new_status`, `remarks`, `create_time`, `update_time`, `pay_amount_all`
  ,`stock_decrease`, `clique_id`, `clique_member_id`, `deliver_store_id`, `delivery_type`, `store_code`, `clerk_code`, `trade_close_reason`, `order_version`,`from_erp`,`order_sequence`
  )
-  select  replace(uuid(), '-', '')  as order_id,oi.erp_order_id ,IFNULL(CONCAT('RE9',floor(UNIX_TIMESTAMP(oi.create_time))),oi.order_number) as order_number  ,members_view.enterprise_id, '-1' as brand_id  ,members_view.member_id,oi.mall_pro_all_price
+  select  replace(uuid(), '-', '')  as order_id,oi.erp_order_id
+  ,IFNULL (oi.order_number,CONCAT('RE999',floor(UNIX_TIMESTAMP(oi.create_time)))) as order_number
+  ,members_view.enterprise_id, '-1' as brand_id  ,members_view.member_id,oi.mall_pro_all_price
 ,oi.actual_freight, oi.actual_freight as mall_order_freight, oi.discount_amount,oi.discount_amount_info,oi.amount_payable_info
 ,oi.pay_amount, oi.pay_type,null as coupon_card_log_id ,oi.coupon_card_code,oi.get_points,oi.use_points,clerk.clerk_id,clerk.store_id_order as store_id,addr.member_address_id 
 ,oi.address_info, addr.county_id as area_id,oi.buyer_name,oi.buyer_phone,logistics.`logistics_company_id`,oi.logistics_number,replace(uuid(), '-', '') as order_process_id ,oi.order_step