From 0cb9e3d513c84c65cb856dd6e845195e79ec6fd6 Mon Sep 17 00:00:00 2001 From: denghy Date: Wed, 17 Apr 2019 16:12:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Real/Commands/Sync/PackageSync.php | 30 +++++++++++++++++- ...4_164434_create_real_order_cards_table.php | 5 +++ storage/app/public/templates/import-flows.xls | Bin 19456 -> 19456 bytes 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app/Domains/Real/Commands/Sync/PackageSync.php b/app/Domains/Real/Commands/Sync/PackageSync.php index 44abefd9..d8c1af53 100644 --- a/app/Domains/Real/Commands/Sync/PackageSync.php +++ b/app/Domains/Real/Commands/Sync/PackageSync.php @@ -39,8 +39,9 @@ class PackageSync extends Command $flowPackages = $this->getFlowPackages(); $optionalPackages = $this->getOptionalPackages(); $additionalPackages = $this->getAdditionalPackages(); + $groupPackages = $this->getGroupPackages(); - $packages = array_merge($renewalPackages, $flowPackages, $optionalPackages, $additionalPackages); + $packages = array_merge($renewalPackages, $flowPackages, $optionalPackages, $additionalPackages, $groupPackages); Package::upsert($packages, ['sn', 'deleted_at']); @@ -204,6 +205,33 @@ class PackageSync extends Command return $this->transform($packages); } + // 组合包 + protected function getGroupPackages() + { + $select = [ + DB::raw('6 as type'), + 'jxc_package_addoptional.bag_number as sn', + 'jxc_package_addoptional.name as name', + DB::raw('"qw" as carrier_operator'), + DB::raw('0 as cost_price'), + 'jxc_package_addoptional.guide_price as guide_price', + DB::raw('0 as flows'), + 'jxc_package_addoptional.content_count as messages', + 'jxc_package_addoptional.reset_cycle as reset_months', + 'jxc_package_addoptional.service_cycle as service_months', + 'jxc_package_addoptional.create_time as created_at', + 'jxc_package_addoptional.del', + ]; + + $packages = DB::connection('real')->table('jxc_package_addoptional')->join('jxc_package_value_add_relation', function ($join) { + $join->on('jxc_package_value_add_relation.value_add_number', '=', 'jxc_package_addoptional.bag_number') + ->whereIn('jxc_package_value_add_relation.custom_no', $this->companies) + ->where('jxc_package_value_add_relation.type', 4); + })->select($select)->where('jxc_package_addoptional.tid', 1)->get(); + + return $this->transform($packages); + } + protected function transform($packages) { $packages = $packages->toArray(); diff --git a/database/migrations/2018_12_24_164434_create_real_order_cards_table.php b/database/migrations/2018_12_24_164434_create_real_order_cards_table.php index a90aef55..d7bc65dd 100644 --- a/database/migrations/2018_12_24_164434_create_real_order_cards_table.php +++ b/database/migrations/2018_12_24_164434_create_real_order_cards_table.php @@ -40,6 +40,7 @@ class CreateRealOrderCardsTable extends Migration $table->addPartition('real_order_flows_package_cards', 'list', [3]); $table->addPartition('real_order_optional_package_cards', 'list', [4]); $table->addPartition('real_order_additional_package_cards', 'list', [5]); + $table->addPartition('real_order_group_package_cards', 'list', [6]); }); Schema::table('real_order_cards', function (Blueprint $table) { @@ -66,6 +67,10 @@ class CreateRealOrderCardsTable extends Migration Schema::table('real_order_additional_package_cards', function (Blueprint $table) { $table->unique(['sim', 'order_id', 'deleted_at']); }); + + Schema::table('real_order_group_package_cards', function (Blueprint $table) { + $table->unique(['sim', 'order_id', 'deleted_at']); + }); } /** diff --git a/storage/app/public/templates/import-flows.xls b/storage/app/public/templates/import-flows.xls index c35c80813b13279a172ce74efd8bdc9f0c07cf1b..bb73db55991a7455576ec25fe0628f05a4220720 100644 GIT binary patch delta 2373 zcmZvdc{J4PAIHC6^Bsm+%rFZz)|s-DZH!$^@>3*{l%^XIQc!=BbdSg`AR# zrsalGwycq)?CGMiT!fS*chbG*{LZQKJUjH1IBa0;OT4w?*dP;_txMFt2W18`_MP(-9aBZ>(O5i%%5ekdIf z3g|^vfOMh4TezIjM391DK)6t0i_k$WLIr=LR)DVvQQ(axqhWCnDnSEGtQ7c;6BV9r zNzkNaAqbjTB0|tP5-AOvhJ_F

z@Tp%N2UdO)o(dmI4|$8o&{x#8xg- zBG`kY$x?o)T4R|?gG3>f{ErH=mn)PjK*-O;RPY!_gGt~PUTwKk1Q3d+q41EpFsTY4 z2z!SITku+-5U&nv0Rw^p2$P_~VxR~AvmUeM?&1kFP=!|lQFuwAR}CoOFTF#hF*6rJ38yWmoXzC*qP^)%Jm zXjbWV+P(|50gtG;VhQ6g2UbgEP7at>?;~@*2a;AX?8;EAxV&LeUpJ4C=8Gc5t$8P= zEuUJen|xPMJ1tw>GB;Pf^^U9QluLQ=iMfy8KIOV@RWLUTo!*?^Al1FGu8L0%nW;=$ z3YpEAofV9`uKU)RNL&3q`I7n4;=?=Lob-*@c$cuL>E;hxUBl+9UCqsSPlF6sWK1Z< z6;B-QmmVj?yZLnLJQxhF>a%l~QF6DwjPW3GY9hcrEBsaA~aJ9u||a<}B4>o*DgT;~r6q z>l%IZ-l;&@fW(rRWM8H&#!{|EQs;hmuv`=K%pUa^)%^TQ$&`dYtO!G#$+_cU%qRTW?kF0DM-gl`J_*0qJ36L5h~Sk^_S>$i!;jO zvDUPOln!0X#~bMOclEnxF%K$2^-106A@&w7Gj@*kSCX^K^TztVXIV+4_O+<0!;=BF zsk(J0BmF4fpanU*EU=%?k1KrB|2=}-vq3O`sVsEXa8Qt$Lv5H}IvMR^kk+?OOY6Ff zGgm`YKzZoGe|{*fZ=b~{&I>g&;t90oWhm-o%k_cjeCf2VV)p5cdf*BQYtX-`AvmjU zYg~dT$;NHQW$JutT&>gA$TSvQYSlB^c5A|)s&H4kE1>=0!I+G*{20#BmoC2N#)|f( z$d+_)NAqlEIy>WfC#j;U9S?OXJ~ryRzjCv@>Al^qb^egw#Y)V&yFu>%>vF56Tzi6f zeTK4^D@$=!I$m^p_-mqZY&g*;lURM_j3aeexx_eqoYgv#b-Hd_Vt6to~s|ER){OUsaGpwS4hIq>H%7Th&d(9?^OAfQF!3WseySXaooJ8m@bIlF` z%??D|D{A(xe6{$U2b_6%D?D zVl#Fil;_r~UGx&Am@J<)_`*BzgW|Se$6acz3}^B){!P_%X+Eo*QLAO~{++3TlFs{A zyH2R>^)qGE#o8->nA=u0`+o084MJGc5?fJEemxwcT_pwn^jN9k!&z>(U%pbJIwhTr_ug;$CS`x9}j6y)aE>%#j<$;2UfT_zt2E`x< zY-LkHnC=SUpw7_EherX2Z4T2xINSK&IZ)1ygN=Z-9$&VGEu3VKDC`J%L!QFVAJT!M zgroZ?=+~pcbKslaaWP-vy*qRO9M{(+ZGkKxHE0QvfH07a(2E0;#&V!jUkavzF?|Qv z1ehBvQcU0gPzH%Y!W{xO8)d>K zf+Hp*82A|lE^m`XQq5$Ld5o65fNq9HkvyaZ?tgBBIYL`_+6gPe83AkkHdtB*(i9f1 a326(LA*2f#KrBI;g&P8&7JRc3L;nMq(87BF delta 2396 zcma)8c|2768$M^8u^WbA#+Efp*D_--k!5U`M4=IG%e9Q9$e@shB1DR>HD#^HrJ>1k zk;zW95UMN6Qb}2E+bzO9bo+fizu*1mcg`Q*_j#W8`@YY6{&`PqE*zT+S3kiZ#E>E# z@C@^_DTF?2%nR`Pd4`FBQ#|(UqCkXo_?}g3{3xO&jNq7qo77zzPI6i+iZIVczwc8Cfy=n>6K~ycy3Q6NzP@51>=0oy5`2kW zqpA#Juja8oRDeI!j>2z&gL*M@)z@|9+uhH@{D0g{DECwf?3sJR@zf&nmPt46GL_7_ zJo5Hj6r*g21-smsT&g;k%n;8>6eneebnNFB$F) z8uu?ROn6-6z>L9i>K|9R3CKwmy{oA?#d_=^J=S=2|7o2Q4D9oY`H!=jOaYcTesgaa z*6XmIVN)mFz9)AeMzwjYe4*AL^rZm7+cM9qB86f<-RPMzz}58^R1{0F%QzldFiGK; zXEr5e;8n-rJnHW7({*H>7QdZwH2>WuQHn2=vt-u*p*598k6D>4d#qg$$=bi&BLo47jPxv9f#MiZOV3wYTnaFHL(2t`H+w_q((}=X$AoDvTaQAJaf z8k2X_MuYXM@5_Y)j@`V0+3=zIFWXdl^QJFc``ucM(b-F^e%|37Di|g3Cp{m6& z3Avl((eROgYD4B=zS0c7*DAW!xvo9U+;_$|um)@y4h&R{>h>TNc|Y&sE!7=O+L?&2 zDskRwx4>%k$0>d68BZ2JoG89Gb4k(VC%0ICAD06O)2)paQ--th7>nw|7KFqtj_&0t zGqVR;`fOQ@Ygw?X(NK@>0sNb~o8fbdLo+vBjBT!HDy1^R*ykP=4Cp&h)jA?0Dn>r! z{#jRZMB5@Dugo)jxs6;J{&J_Ar{0KseZP<%CGV8VxLtSf5d(Q2OlHJ4%DeFiilf4@ z_fgt>rD8tj1_ikrj`ioe@p`-Nx?OpTmoN9$@MO1)z8X#HB&#x)8%36 z8&W=z(JYdtQgP>^V{L`MyS|R}h}#%DA@jB1py!Z73e(kPIE%E7&(xox;se~;%dNlns_0FY)U;TWmrGXqwdNKoFuo1o=>ZjMl5K(WwUP*X^ z*Esuv8tq%VclPFH79`rdI z5YA~hbbWZQOLynMsE?ED!6nhF4Zd(pZNSN1OhBDlLD2zI+pX5cN#txVYe`Oe{Fj5> z!NfoUBiDT*$k0G4aAxgZTCcX(>S&t3gdxcdQ)yZC8E;fy7{5ekO{s?Xy!x%vCe^aR zwXM3xY1hS{loda2x9$0*)+Lr{wIz*av}1A~pSXK(U%Y!3jXaij#d&mM(ht?o| zh!?U2O$NH?9$YYRhBbh>;flJ(#y<)K3q!mZ5ojGC(0_B7?;P+mVsJrb=fRlKAshm6 zp)8E%q7fI^xiufwU>`Nc!(eG!#71}?16EC>5c~s@Gh4AvVl%8% mDDT-i=DT4rGNgr0qy?>?29P174;iv^EDj=YEc>f95B6_*`@aYP