From 649e5967f438360032899b5c5cc5710dd00a1e8f Mon Sep 17 00:00:00 2001 From: dengbw Date: Sat, 6 May 2023 11:29:46 +0800 Subject: [PATCH] market_draw_h52 --- home/controllers/h5/market/Draw.php | 10 +++++++++- market/controllers/api/sylive/GroupsOrder.php | 15 ++++++++------- www/market/temp/order.xlsx | Bin 9260 -> 9534 bytes 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/home/controllers/h5/market/Draw.php b/home/controllers/h5/market/Draw.php index 24765218..2cb413b6 100644 --- a/home/controllers/h5/market/Draw.php +++ b/home/controllers/h5/market/Draw.php @@ -143,6 +143,14 @@ class Draw extends CI_Controller $count = $this->mdSyliveOrder->count($whereOrder); $list = $result = []; if ($count) {//判断抽奖名单 + $defaultHead = 'https://qs.haodian.cn/web/images/project/H5-ShiYu/default-head.png'; + if ($re['organizationId']) {//修改默认头像为机构logo + $this->load->model('market/Market_sylive_organization_model', 'mdSyliveOrganization'); + $reOrg = $this->mdSyliveOrganization->get(['organizationId' => $re['organizationId']]); + if ($reOrg['logo']) { + $defaultHead = build_qiniu_image_url($reOrg['logo']); + } + } //随机数据 $res = $this->db->query($sqlOrder)->result_array(); if ($res) { @@ -155,7 +163,7 @@ class Draw extends CI_Controller if ($map_user[$v['userId']]) { $headimg = $map_user[$v['userId']]; } else { - $headimg = 'https://qs.haodian.cn/web/images/project/H5-ShiYu/default-head.png'; + $headimg = $defaultHead; } $list[] = ['headimg' => $headimg, 'name' => $name, 'tel' => $tel, 'id' => intval($v['id']), 'uname' => $v['uname'], 'mobile' => $v['mobile']]; diff --git a/market/controllers/api/sylive/GroupsOrder.php b/market/controllers/api/sylive/GroupsOrder.php index 04a62238..0233aa74 100644 --- a/market/controllers/api/sylive/GroupsOrder.php +++ b/market/controllers/api/sylive/GroupsOrder.php @@ -286,8 +286,8 @@ class groupsOrder extends BaseController $done = 0; for ($_row = 2; $_row <= $rowCnt; $_row++) { //读取内容 $itemId = $itemPrice = $totalPrice = $cfUserId = $bizId = $levelId1 = $levelId2 = $levelId3 = $userId = $cfUserId = 0; - $sid = create_order_no('350200', 'market'); - $mobile = $objWorksheet->getCell('B' . $_row)->getValue(); + $sid = $objWorksheet->getCell('A' . $_row)->getValue(); + $mobile = $objWorksheet->getCell('C' . $_row)->getValue(); $itemTitle = $objWorksheet->getCell('D' . $_row)->getValue(); if ($mobile) { $where = ['mobile' => $mobile, "activityId" => $activityId]; @@ -301,11 +301,11 @@ class groupsOrder extends BaseController } $re_order = $this->mdSyliveOrder->get($where); if (!$re_order) { - $uname = $objWorksheet->getCell('A' . $_row)->getValue(); - $totalPrice = $objWorksheet->getCell('C' . $_row)->getValue(); - $createTime = $objWorksheet->getCell('E' . $_row)->getValue(); - $bizName = $objWorksheet->getCell('F' . $_row)->getValue(); - $cfMobile = $objWorksheet->getCell('H' . $_row)->getValue(); + $uname = $objWorksheet->getCell('B' . $_row)->getValue(); + $totalPrice = $objWorksheet->getCell('E' . $_row)->getValue(); + $createTime = $objWorksheet->getCell('F' . $_row)->getValue(); + $bizName = $objWorksheet->getCell('G' . $_row)->getValue(); + $cfMobile = $objWorksheet->getCell('I' . $_row)->getValue(); if ($cfMobile) { $re_user = $this->mdSyliveUser->get(['mobile' => $cfMobile, 'organizationId>' => 0, 'status<>' => -1]); if ($re_user['userId']) { @@ -335,6 +335,7 @@ class groupsOrder extends BaseController if ($re_order['userId']) { $userId = $re_order['userId']; } + !$sid && $sid = create_order_no('350200', 'market'); !$createTime && $createTime = "0000-00-00 00:00:00"; $addData = [ 'itemId' => $itemId, diff --git a/www/market/temp/order.xlsx b/www/market/temp/order.xlsx index a18e11a3835ba6f868d9931340784d2873ffb526..9b927035649b5ae249e7634ee35cfa65a7a496bd 100644 GIT binary patch delta 2424 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 delta 2176 zcmY*ac{tRI8lHt_Y_r&zF=n%`St7f!WEn)(6vr}isq9-dr#rUnTYj>WkmM-)au^l&G*vmc>G%-9B7`R>SWA<18xwDSxVMbdbnc zJJ3ig#g;XNNOX=RsZ0AaN$W#ymjq3NmhRDSTPhasaR#PmfE{OB7t-cMg|lJA3Bm(S zeE+`y4UmlTLWzNPvaj(*`e>Bx&S0GB7fpxH%@02M3bpiSmkJ=)Qr{rDtEx(6{XO>% z`SoAd1Qa-QQb${OBZrMSCAkBga<^8G{@$Ed?ic*M#n##+#=>5lu7Ni z%(+-?3Bpyrc{pQk)lBu|I3){HnhuJjYO{3le!=3*ge}Z@ODG#Z2n2$I;;rWl@4;ruD#<&P+|rj?2)KYymNfHs-wDIR(Lvfbel3_ zO0~F>F5RtRMjc>c*n5<)d$S7ZKWlnN5*mso{cOC36gF-4WLC1)Cn3*9WNKFVA7(sJ zMQ})R)6LJsUynLX%L=H!a&)S6V~T26juCKt$#{kw3+FAiIvQFl=UFauN6a^DHkWHY z$jH!~QkLw)N}WAGgoFm|J+un0`*ZQB`22pM>T8j4<>J>uf~wgLYF+9!J{DE^4htHX zP`wX5r2YtC11k#564?L-n=S&1pckk@L7+Si5J(sVAS6VYMUH*`lgg;)Ld*K_XXom@ zdoc2_#GG;iE;g$iRfSYPVrFG#w8~9UDc)l> z!C2AcS%M`(Z-3v5p(>GWug2la;``R8Z5G^ec<6g4XhSv~^cN-0_+X*ZUMm7Cf+bW8 zf0iNd(V2rLQ~|xD7}5o>ni?~S)Pv#fwx+sJg5&;djf+{|m5)?MTAwD%N}*ASDp zmbAVdLANd;&U}w2G@T~Y=zc-cpjg;kvJ1X-fkA`mgnu7ua~UXfAq{FSqqY+SE^OSi z2*}XvS_qf-T$wI+J;k>23ZUf`Js3u05|i?o25T&Ela_hcyt+e{ybv8$e7oUNEVsjZ z*8q;O9}6=@`aB#HJaa-Z)RB?w(x*ZR`12^wM<~mj_OwkWp2O&hsLy9WZ_J=w1GUl8 z-}~rs4qH8Y?GjpnvdHbQFMd~(KD#&*zJ8Ihlfxa+?`s{f-Qb*zDAomQV+G<=8tW{W z`{pL{Q8j^aaQ6e&)rkz26yM)Ev*??z+~w$P%ZUQ-T6D^$k~QicHrUJ9Na>yqH_egQ_}OD zNlJc#pHR@Gu}(O8UUKeHa;`lb7FNZ2rTUJP-7HFwtE>3%F|`nRnN^+W9EN84TW*9Q z%O&*)fgRtxx_&R) zBQH`o{>t(fJ3Bs7yZprYmc7C;_{3NZd>mCMM4SlbTsjy8lKSN=eh^SX5@d#DPFp|> zh2sWe);#h;rpGTgIfu8zl*mVx3RG_LL5284urQcQ;1fAJc z%;)7ZJxZg`Ed7YvrRjP3_P?j3Ag zzp5>4W?mEdh~vF*2Ittgbjc#KLnXmWg3osLG{Uk@`rgvZcNU%O1LEz?>Jha4+xxtj{id)RBGJ2f6UaGcH8Tr=X;C4 z`S(+@UZqcR88148Ld)+)?7UbXi0)2<5cGGo(~oup{+LR5E^FTePceBPTh0orTt3g| z>b#x3bg0+@d+vJYHZr|>hRt53TLC{Iz{>Nl-jnT4aJzp?2rf?U`5b}e8d201QjF{ z3j(ODf4vp~0fG2_b