From b1a61b9274fae77ce0035a9eb04c3763b4613157 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Fri, 3 Feb 2023 11:07:54 +0800
Subject: [PATCH] market_draw_203

---
 .../market/Market_sylive_order_model.php      | 80 -------------------
 home/controllers/h5/market/sylive/Ucenter.php | 28 +++++--
 .../controllers/h5/market/sylive2/Ucenter.php | 28 +++++--
 market/controllers/api/sylive/Activity.php    |  4 +-
 4 files changed, 42 insertions(+), 98 deletions(-)

diff --git a/common/models/market/Market_sylive_order_model.php b/common/models/market/Market_sylive_order_model.php
index 2f58bdda..535ffdaf 100644
--- a/common/models/market/Market_sylive_order_model.php
+++ b/common/models/market/Market_sylive_order_model.php
@@ -65,84 +65,4 @@ class Market_sylive_order_model extends HD_Model
             return $arr;
         }
     }
-
-    /**
-     * Notes:中奖类型
-     * Created on: 2022/11/08 14:46
-     * Created by: dengbw
-     * @param int $activityId
-     * @param int $type
-     * @return array|mixed
-     */
-    public function winTypeAry($activityId = 0, $type = 0)
-    {
-        $winType = [];
-        $img = 'https://qs.haodian.cn/web/images/project/H5-ShiYu-draw';
-        if ($activityId == 4) {//纳米BOX双11纳享嗨购日
-            $winType = [0 => ['title' => '请选择抽奖类型']
-                , 6 => ['title' => '150元京东卡', 'tag' => '六等奖', 'merge' => 1, 'img' => $img . '/prize-jd-150.png', 'price' => 0.99]
-                , 5 => ['title' => '200元京东卡', 'tag' => '五等奖', 'merge' => 1, 'img' => $img . '/prize-jd-200.png', 'price' => 0.99]
-                , 4 => ['title' => '300元京东卡', 'tag' => '四等奖', 'merge' => 1, 'img' => $img . '/prize-jd-300.png', 'price' => 0.99]
-                , 3 => ['title' => '500元京东卡', 'tag' => '三等奖', 'merge' => 1, 'img' => $img . '/prize-jd-500.png', 'price' => 0.99]
-                , 2 => ['title' => 'iphone14', 'tag' => '二等奖', 'merge' => 1, 'img' => $img . '/prize-iPhone14.png', 'price' => 199]
-                , 1 => ['title' => '半价购车权益', 'tag' => '一等奖', 'merge' => 1, 'img' => $img . '/prize-banjia.png', 'price' => 199]
-                , 7 => ['title' => '200元京东卡', 'tag' => '199独享', 'merge' => 1, 'img' => $img . '/prize-jd-200.png', 'price' => 199]
-                , 8 => ['title' => '500元京东卡', 'tag' => '199独享', 'merge' => 1, 'img' => $img . '/prize-jd-500.png', 'price' => 199]
-                , 9 => ['title' => '1000元京东卡', 'tag' => '199独享', 'merge' => 1, 'img' => $img . '/prize-jd-1000.png', 'price' => 199]
-            ];
-        } else if ($activityId == 5) {//哪吒汽车宁德时代员工私享内购会
-            $winType = [0 => ['title' => '请选择抽奖类型']
-                , 1 => ['title' => '哪吒V车模', 'tag' => '车模', 'merge' => 0, 'img' => $img . '/nz-prize-chemo.png', 'price' => 0.99]
-                , 2 => ['title' => '车载吸尘器', 'tag' => '吸尘器', 'merge' => 0, 'img' => $img . '/nz-prize-xihenqi.png', 'price' => 0.99]
-                , 3 => ['title' => '免费保养券', 'tag' => '保养券', 'merge' => 0, 'img' => $img . '/nz-prize-baoyangquan.png', 'price' => 0.99]
-                , 4 => ['title' => '65寸液晶电视', 'tag' => '电视机', 'merge' => 0, 'img' => $img . '/nz-prize-dianshi.png', 'price' => 99]
-            ];
-        } else if ($activityId == 6) {//万券齐发，国补保价——纳米BOX年终抢购会 ​
-            $winType = [0 => ['title' => '请选择抽奖类型']
-                , 1 => ['title' => '体脂称', 'tag' => '体脂称', 'merge' => 0, 'img' => $img . '/221214-prize-1.png', 'price' => 9.90]
-                , 2 => ['title' => '车载空气净化器', 'tag' => '净化器', 'merge' => 0, 'img' => $img . '/221214-prize-6.png', 'price' => 9.90]
-                , 3 => ['title' => '电烤箱', 'tag' => '电烤箱', 'merge' => 0, 'img' => $img . '/221214-prize-3.png', 'price' => 9.90]
-                , 4 => ['title' => '车载冰箱', 'tag' => '冰箱', 'merge' => 0, 'img' => $img . '/221214-prize-5.png', 'price' => 9.90]
-                , 5 => ['title' => '微波炉', 'tag' => '微波炉', 'merge' => 0, 'img' => $img . '/221214-prize-2.png', 'price' => 9.90]
-                , 6 => ['title' => '吸尘器', 'tag' => '吸尘器', 'merge' => 0, 'img' => $img . '/221214-prize-4.png', 'price' => 9.90]
-                , 7 => ['title' => '仟元购车券', 'tag' => '购车券', 'merge' => 0, 'img' => $img . '/221214-prize-9.jpg', 'price' => 9.90]
-                , 8 => ['title' => '万元购车券', 'tag' => '购车券', 'merge' => 0, 'img' => $img . '/221214-prize-7.png', 'price' => 9.90]
-            ];
-        }
-        if ($type) {
-            $winType = $winType[$type];
-        }
-        return $winType;
-    }
-
-    /**
-     * Notes:抽奖配置
-     * Created on: 2022/12/14 9:55
-     * Created by: dengbw
-     * @param int $activityId
-     * @param string $type
-     * @return array|mixed
-     */
-    public function drawConfig($activityId = 0, $type = '')
-    {
-        $winNumAry = [];//中奖人数
-        $bgImg = '';//抽奖背景图
-        if ($activityId == 4) {
-            $winNumAry = [['title' => '请选择中奖人数', 'value' => 0],
-                ['title' => '1人', 'value' => 1], ['title' => '2人', 'value' => 2],
-                ['title' => '5人', 'value' => 5], ['title' => '50人', 'value' => 50]];
-            $bgImg = 'https://qs.haodian.cn/web/images/project/H5-ShiYu-draw/bg.png?v=20221110';
-        } else if ($activityId == 6) {
-            $winNumAry = [['title' => '请选择中奖人数', 'value' => 0],
-                ['title' => '1人', 'value' => 1], ['title' => '20人', 'value' => 20], ['title' => '30人', 'value' => 30],
-                ['title' => '40人', 'value' => 40], ['title' => '50人', 'value' => 50]];
-            $bgImg = 'https://qs.haodian.cn/web/images/project/H5-ShiYu-draw/bg-20221213.png?v=20221214';
-        }
-        $data = ['winNumAry' => $winNumAry, 'bgImg' => $bgImg];
-        if ($type) {
-            $data = $data[$type];
-        }
-        return $data;
-    }
-
 }
\ No newline at end of file
diff --git a/home/controllers/h5/market/sylive/Ucenter.php b/home/controllers/h5/market/sylive/Ucenter.php
index b8dc3ee7..1e84411e 100644
--- a/home/controllers/h5/market/sylive/Ucenter.php
+++ b/home/controllers/h5/market/sylive/Ucenter.php
@@ -59,15 +59,27 @@ class Ucenter extends Wx{
         $total = $this->market_sylive_order_model->count($where);;
         $lists = [];
         if($total){
-            $rows = $this->market_sylive_order_model->select($where,'id desc',$page,$size,'id,sid,winType');
+            $this->load->model('market/Market_sylive_activity_draw_model', 'mdSyliveActivityDraw');
+            $re_draw = $this->mdSyliveActivityDraw->get(['activityId' => $this->a_id]);
+            $winTypeAry = [];
+            if ($re_draw && $re_draw['winType']) {
+                $json_winType = json_decode($re_draw['winType'], true);
+                foreach ($json_winType as $v) {
+                    $v['img'] && $v['img'] = build_qiniu_image_url($v['img']);
+                    $winTypeAry[$v['id']] = ['img' => $v['img'], 'tag' => $v['tag'], 'title' => $v['title']];
+                }
+            }
+            $rows = $this->market_sylive_order_model->select($where,'id desc',$page,$size,'id,winType');
             foreach ($rows as $key => $val) {
-                $winType = $this->market_sylive_order_model->winTypeAry($this->a_id,$val['winType']);
-                $lists[] = [
-                    'id' => $val['id'],
-                    'img' => $winType['img'],
-                    'title' => $winType['tag'],
-                    'goods' => $winType['title']
-                ];
+                $winTypeItem = $winTypeAry[$val['winType']];
+                if($winTypeItem){
+                    $lists[] = [
+                        'id' => $val['id'],
+                        'img' => $winTypeItem['img'],
+                        'title' => $winTypeItem['tag'],
+                        'goods' => $winTypeItem['title']
+                    ];
+                }
             }
         }
         $data = [
diff --git a/home/controllers/h5/market/sylive2/Ucenter.php b/home/controllers/h5/market/sylive2/Ucenter.php
index f6fd7783..f0d05f29 100644
--- a/home/controllers/h5/market/sylive2/Ucenter.php
+++ b/home/controllers/h5/market/sylive2/Ucenter.php
@@ -59,15 +59,27 @@ class Ucenter extends Wx{
         $total = $this->market_sylive_order_model->count($where);;
         $lists = [];
         if($total){
-            $rows = $this->market_sylive_order_model->select($where,'id desc',$page,$size,'id,sid,winType');
+            $this->load->model('market/Market_sylive_activity_draw_model', 'mdSyliveActivityDraw');
+            $re_draw = $this->mdSyliveActivityDraw->get(['activityId' => $this->a_id]);
+            $winTypeAry = [];
+            if ($re_draw && $re_draw['winType']) {
+                $json_winType = json_decode($re_draw['winType'], true);
+                foreach ($json_winType as $v) {
+                    $v['img'] && $v['img'] = build_qiniu_image_url($v['img']);
+                    $winTypeAry[$v['id']] = ['img' => $v['img'], 'tag' => $v['tag'], 'title' => $v['title']];
+                }
+            }
+            $rows = $this->market_sylive_order_model->select($where,'id desc',$page,$size,'id,winType');
             foreach ($rows as $key => $val) {
-                $winType = $this->market_sylive_order_model->winTypeAry($this->a_id,$val['winType']);
-                $lists[] = [
-                    'id' => $val['id'],
-                    'img' => $winType['img'],
-                    'title' => $winType['tag'],
-                    'goods' => $winType['title']
-                ];
+                $winTypeItem = $winTypeAry[$val['winType']];
+                if($winTypeItem){
+                    $lists[] = [
+                        'id' => $val['id'],
+                        'img' => $winTypeItem['img'],
+                        'title' => $winTypeItem['tag'],
+                        'goods' => $winTypeItem['title']
+                    ];
+                }
             }
         }
         $data = [
diff --git a/market/controllers/api/sylive/Activity.php b/market/controllers/api/sylive/Activity.php
index 6bdaad39..90aed01c 100644
--- a/market/controllers/api/sylive/Activity.php
+++ b/market/controllers/api/sylive/Activity.php
@@ -612,8 +612,8 @@ class Activity extends BaseController
                 $setWinType[] = $v;
             }
         }
-        $upDate['winNum'] = $setWinNum ? json_encode($setWinNum, JSON_UNESCAPED_UNICODE) : [];
-        $upDate['winType'] = $setWinType ? json_encode($setWinType, JSON_UNESCAPED_UNICODE) : [];
+        $upDate['winNum'] = $setWinNum ? json_encode($setWinNum, JSON_UNESCAPED_UNICODE) : null;
+        $upDate['winType'] = $setWinType ? json_encode($setWinType, JSON_UNESCAPED_UNICODE) : null;
         if (!$re) {
             $upDate['activityId'] = $activityId;
             $upDate['createTime'] = date('Y-m-d H:i:s');