From 63dafeff3da2358790646c8d2fc9c98cd3ba07ae Mon Sep 17 00:00:00 2001 From: baji Date: Fri, 28 Mar 2025 20:56:05 +0800 Subject: [PATCH] 111 --- app/admin/view/Goods/goods_add.html | 10 +++++++++ app/admin/view/Goods/goods_edit.html | 9 +++++++++ app/admin/view/view_kM6dcB.tar.gz | Bin 4160 -> 0 bytes app/api/controller/Goods.php | 22 ++++++++++++-------- app/api/controller/Warehouse.php | 29 ++++++++++++++++++--------- 5 files changed, 53 insertions(+), 17 deletions(-) delete mode 100755 app/admin/view/view_kM6dcB.tar.gz diff --git a/app/admin/view/Goods/goods_add.html b/app/admin/view/Goods/goods_add.html index 9054764..95a326f 100755 --- a/app/admin/view/Goods/goods_add.html +++ b/app/admin/view/Goods/goods_add.html @@ -34,6 +34,16 @@ + +
+ +
+ + +
+
diff --git a/app/admin/view/Goods/goods_edit.html b/app/admin/view/Goods/goods_edit.html index b0714b9..0b44bd1 100755 --- a/app/admin/view/Goods/goods_edit.html +++ b/app/admin/view/Goods/goods_edit.html @@ -32,6 +32,15 @@ disabled {if $type eq 11} checked {/if}>
+
+ +
+ + +
+
diff --git a/app/admin/view/view_kM6dcB.tar.gz b/app/admin/view/view_kM6dcB.tar.gz deleted file mode 100755 index d29ce36ee74082baafd991c88e115d95830c9731..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4160 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 KwqsZTpa1}!w>=;L diff --git a/app/api/controller/Goods.php b/app/api/controller/Goods.php index c554dec..7ffbb49 100755 --- a/app/api/controller/Goods.php +++ b/app/api/controller/Goods.php @@ -63,7 +63,14 @@ class Goods extends Base $whe[] = ['type', '=', 2]; } elseif ($type_str == 3) { $whe[] = ['type', '=', 3]; - } elseif ($type_str == 5) { + } elseif ($type_str == 4) { + // $whe[] = ['type', '=', 6]; + // 添加 (type = 1 or is_shouye = 1) 条件 + $whe[] = function ($query) { + $query->where('type', '=', 1) + ->whereOr('is_shouye', '=', 1); + }; + } elseif ($type_str == 5) { $whe[] = ['type', '=', 5]; } elseif ($type_str == 6) { $whe[] = ['type', '=', 6]; @@ -77,7 +84,6 @@ class Goods extends Base $paginate = 999; $whe[] = ['type', '=', 10]; } elseif ($type_str == 11) { - $whe[] = ['type', '=', 11]; } elseif ($type_str == 12) { $whe[] = ['type', '=', 9]; @@ -521,13 +527,13 @@ class Goods extends Base if ($goods['type'] == 6 && $goods['quanju_xiangou'] > 0) { //限购 $user_xiangou_count = OrderList::field('id')->where('goods_id', '=', $goods_id) - ->where('num', '=', $num) - ->where('shang_id', 'between', self::$shang_count_id) - ->where('order_type', '=', $goods['type']) - ->where('user_id', '=', $user['id']) - ->count(); + ->where('num', '=', $num) + ->where('shang_id', 'between', self::$shang_count_id) + ->where('order_type', '=', $goods['type']) + ->where('user_id', '=', $user['id']) + ->count(); //已经达到限购先上限 - if($goods['quanju_xiangou']<=$user_xiangou_count){ + if ($goods['quanju_xiangou'] <= $user_xiangou_count) { return $this->renderError('当前箱子限购' . $goods['quanju_xiangou'] . '次'); } } diff --git a/app/api/controller/Warehouse.php b/app/api/controller/Warehouse.php index 102afa3..5f82d88 100755 --- a/app/api/controller/Warehouse.php +++ b/app/api/controller/Warehouse.php @@ -99,7 +99,7 @@ class Warehouse extends Base return imageUrl($value); }) ->withAttr('goodslist_money', function ($value, $data) { - return (float) $value * 100; + return (float) $value ; }) ->group("prize_code") ->select()->toArray(); @@ -159,7 +159,7 @@ class Warehouse extends Base return imageUrl($value); }) ->withAttr('goodslist_money', function ($value, $data) { - return (float) $value * 100; + return (float) $value; }) ->withAttr('goodslist_sale_time', function ($value, $data) { return date('Y-m-d', $value); @@ -276,7 +276,7 @@ class Warehouse extends Base return imageUrl($value); }) ->withAttr('goodslist_money', function ($value, $data) { - return (float) $value * 100; + return (float) $value; }) ->group("prize_code") ->select()->toArray(); @@ -333,7 +333,7 @@ class Warehouse extends Base return imageUrl($value); }) ->withAttr('goodslist_money', function ($value, $data) { - return (float) $value * 100; + return (float) $value; }) ->group("prize_code") ->select()->toArray(); @@ -638,10 +638,10 @@ class Warehouse extends Base 'choice_time' => time(), ]); #兑换金额 - $total_money *= 100; + // $total_money *= 100; if ($total_money > 0) { - // $res[] = User::changeMoney($user_id, $total_money, 4, '兑换获得'); - User::changeIntegral($user_id, $total_money, 4, '兑换获得'); + $res[] = User::changeMoney($user_id, $total_money, 4, '兑换获得'); + // User::changeIntegral($user_id, $total_money, 4, '兑换获得'); } if (resCheck($res)) { Db::commit(); @@ -683,11 +683,21 @@ class Warehouse extends Base #装换结构 $recovery_info = json_decode($recovery_info, true); $order_list_id = []; + $goodslist_money_sum = 0; foreach ($recovery_info as $value) { $lim = $value['number']; if (is_string($lim)) { $lim = intval($lim); } + $goodslist_money_list = OrderList::field('goodslist_money') + ->where('user_id', '=', $user_id) + ->where('status', '=', 0) + ->where('insurance_is', '=', 0) + ->where('goodslist_type', '=', 1) + ->where('prize_code', '=', trim($value['prize_code'])) + ->limit($lim) + ->column("goodslist_money"); + $goodslist_moneys = array_sum($goodslist_money_list); $order_list_ids = OrderList::field('id') ->where('user_id', '=', $user_id) ->where('status', '=', 0) @@ -697,8 +707,9 @@ class Warehouse extends Base ->limit($lim) ->column("id"); $order_list_id = array_merge($order_list_id, $order_list_ids); + $goodslist_money_sum += $goodslist_moneys; } - if (!$order_list_id) { + if ($goodslist_money_sum == 0) { return $this->renderError("请刷新重新选择奖品"); } #发货数量 @@ -754,7 +765,7 @@ class Warehouse extends Base #为满足发货条件 // // dd($free_post,$count); - if ($free_post > $count && $post_money > 0) { + if ($goodslist_money_sum < 288) { $body = '背包发货' . $count . '件'; $attach = 'order_list_send'; $payRes = (new Pay())->wxCreateOrder($send_num, $post_money, $user['openid'], $body, $attach);