商品

app/admin/controller/system/SystemStore.php

@@ -127,9 +127,13 @@ class SystemStore extends AuthController
             ['latlng', ''],
             ['valid_time', []],
             ['day_time', []],
+            ['slider_image', []],
+            ['images', []],
         ]);
         SystemStoreModel::beginTrans();
         try {
+            $data['slider_image'] = json_encode($data['slider_image']);
+            $data['images'] = json_encode($data['images']);
             $data['address'] = implode(',', $data['address']);
             $data['latlng'] = is_string($data['latlng']) ? explode(',', $data['latlng']) : $data['latlng'];
             if (!isset($data['latlng'][0]) || !isset($data['latlng'][1])) return JsonService::fail('请选择门店位置');

app/admin/model/store/StoreProductAttr.php

@@ -83,7 +83,7 @@ class StoreProductAttr extends BaseModel
             ];
         }
         foreach ($valueList as $k => $value) {
-//            sort($value['detail'], SORT_STRING);
+            sort($value['detail'], SORT_STRING);
             $suk = implode(',', $value['detail']);
             $valueGroup[$suk] = [
                 'product_id' => $productId,

app/admin/view/system/system_store/add.php

@@ -90,7 +90,7 @@
                                                 </div>
                                             </template>
                                         </div>
-                                        <div class="ivu-upload" style="display: inline-block; width: 58px;" @click="openWindows('选择图片','{:Url('widget.images/index',['fodder'=>'image'])}',{w:900,h:550})" v-if="!form.image">
+                                        <div class="ivu-upload" style="display: inline-block; width: 58px;" @click="openWindows('选择图片','{:Url('widget.images/index',['fodder'=>'slider_image'])}',{w:900,h:550})" v-if="!form.image">
                                             <div class="ivu-upload ivu-upload-drag">
                                                 <div style="width: 58px; height: 58px; line-height: 58px;">
                                                     <i class="ivu-icon ivu-icon-camera" style="font-size: 20px;"></i>
@@ -103,6 +103,58 @@
                                     </i-Col>
                                 </Row>
                             </Form-Item>
+                            <Form-Item>
+                                <Row>
+                                    <i-Col span="13">
+                                        <span>门头：</span>
+                                        <div class="demo-upload-list" v-if="form.slider_image">
+                                            <template>
+                                                <img :src="form.slider_image">
+                                                <div class="demo-upload-list-cover">
+                                                    <Icon type="ios-eye-outline" @click="visible = true "></Icon>
+                                                    <Icon type="ios-trash-outline" @click="form.slider_image=''"></Icon>
+                                                </div>
+                                            </template>
+                                        </div>
+                                        <div class="ivu-upload" style="display: inline-block; width: 58px;" @click="openWindows('选择图片','{:Url('widget.images/index',['fodder'=>'slider_image'])}',{w:900,h:550})" v-if="!form.slider_image">
+                                            <div class="ivu-upload ivu-upload-drag">
+                                                <div style="width: 58px; height: 58px; line-height: 58px;">
+                                                    <i class="ivu-icon ivu-icon-camera" style="font-size: 20px;"></i>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div style="width: 670px; height: 320px;bottom:10%;display: block; position: absolute;z-index: 999999" v-if="visible" @click="visible = false ">
+                                            <img :src="form.slider_image"   style="max-width: 100%;max-height: 100%;width:auto;height:auto;position: absolute;left: 50%;top: 50%;transform: translate3d(-50%,-50%,0);-webkit-transform: translate3d(-50%,-50%,0);" >
+                                        </div>
+                                    </i-Col>
+                                </Row>
+                            </Form-Item>
+                            <Form-Item>
+                                <Row>
+                                    <i-Col span="13">
+                                        <span>门店：</span>
+                                        <div class="demo-upload-list" v-if="form.images">
+                                            <template>
+                                                <img :src="form.images">
+                                                <div class="demo-upload-list-cover">
+                                                    <Icon type="ios-eye-outline" @click="visible = true "></Icon>
+                                                    <Icon type="ios-trash-outline" @click="form.images=''"></Icon>
+                                                </div>
+                                            </template>
+                                        </div>
+                                        <div class="ivu-upload" style="display: inline-block; width: 58px;" @click="openWindows('选择图片','{:Url('widget.images/index',['fodder'=>'images'])}',{w:900,h:550})" v-if="!form.images">
+                                            <div class="ivu-upload ivu-upload-drag">
+                                                <div style="width: 58px; height: 58px; line-height: 58px;">
+                                                    <i class="ivu-icon ivu-icon-camera" style="font-size: 20px;"></i>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div style="width: 670px; height: 320px;bottom:10%;display: block; position: absolute;z-index: 999999" v-if="visible" @click="visible = false ">
+                                            <img :src="form.images"   style="max-width: 100%;max-height: 100%;width:auto;height:auto;position: absolute;left: 50%;top: 50%;transform: translate3d(-50%,-50%,0);-webkit-transform: translate3d(-50%,-50%,0);" >
+                                        </div>
+                                    </i-Col>
+                                </Row>
+                            </Form-Item>
                             <Form-Item>
                                 <Row>
                                     <i-Col span="13">
@@ -130,7 +182,6 @@
     </div>
 </div>
 <script src="{__PLUG_PATH}city.js"></script>
-<script src="{__ADMIN_PATH}js/layuiList.js"></script>
 
 <script>
     var storeData={:json_encode($store)};
@@ -159,6 +210,8 @@
                         phone:storeData.phone || '',
                         address:storeData.address || [],
                         image:storeData.image || '',
+                        slider_image:storeData.slider_image ,
+                        images:storeData.images ,
                         detailed_address:storeData.detailed_address || '',
                         latlng:storeData.latlng || '',
                         valid_time:storeData.valid_time || [],

app/api/controller/PublicController.php

@@ -320,4 +320,22 @@ class PublicController
         return app('json')->successful($data);
     }
 
+
+    /**
+     * 门店详情
+     * @param $id
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function store_details($id)
+    {
+        $data = SystemStore::find($id);
+        $data = empty($data) ? [] : $data->toArray();
+        $data['slider_image'] = json_decode($data['slider_image']);
+        $data['images'] = json_decode($data['images']);
+        return app('json')->successful($data);
+    }
+
 }

app/api/controller/user/UserRechargeController.php

@@ -5,6 +5,7 @@ namespace app\api\controller\user;
 use app\models\system\SystemGroupData;
 use app\models\user\UserRecharge;
 use app\Request;
+use crmeb\repositories\PaymentRepositories;
 use crmeb\services\GroupDataService;
 use crmeb\services\SystemConfigService;
 use crmeb\services\UtilService;
@@ -58,6 +59,24 @@ class UserRechargeController
                 else
                     return app('json')->fail(UserRecharge::getErrorInfo());
                 break;
+            case 2: // 充值预约卷
+                $paid_price = 0;
+                if ($recharId) {
+                    $data = SystemGroupData::getDateValue($recharId);
+                    if ($data === false) {
+                        return app('json')->fail('您选择的充值方式已下架!');
+                    } else {
+                        $paid_price = $data['give_money'] ?? 0;
+                    }
+                }
+                $rechargeOrder = UserRecharge::addyy($request->uid(), $price, 'routine', $paid_price);
+                if (!$rechargeOrder) return app('json')->fail('充值订单生成失败!');
+                try {
+                    return app('json')->successful(UserRecharge::jsPay($rechargeOrder));
+                } catch (\Exception $e) {
+                    return app('json')->fail($e->getMessage());
+                }
+                break;
             default:
                 return app('json')->fail('缺少参数');
                 break;
@@ -72,6 +91,8 @@ class UserRechargeController
      */
     public function wechat(Request $request)
     {
+        halt(PaymentRepositories::wechatUserRecharge('wx2022040118073910005'));
+
         list($price, $recharId, $from, $type) = UtilService::postMore([
             [['price', 'f'], 0],
             [['rechar_id', 'd'], 0],
@@ -111,6 +132,24 @@ class UserRechargeController
                 else
                     return app('json')->fail(UserRecharge::getErrorInfo());
                 break;
+            case 2: // 充值预约卷
+                $paid_price = 0;
+                if ($recharId) {
+                    $data = SystemGroupData::getDateValue($recharId);
+                    if ($data === false) {
+                        return app('json')->fail('您选择的充值方式已下架!');
+                    } else {
+                        $paid_price = $data['give_money'] ?? 0;
+                    }
+                }
+                $rechargeOrder = UserRecharge::addyy($request->uid(), $price, 'routine', $paid_price);
+                if (!$rechargeOrder) return app('json')->fail('充值订单生成失败!');
+                try {
+                    return app('json')->successful(UserRecharge::jsPay($rechargeOrder));
+                } catch (\Exception $e) {
+                    return app('json')->fail($e->getMessage());
+                }
+                break;
             default:
                 return app('json')->fail('缺少参数');
                 break;

app/models/store/StoreProduct.php

@@ -193,6 +193,8 @@ class StoreProduct extends BaseModel
         if (!empty($list)) {
             foreach ($list as $k => $v) {
                 $list[$k]['activity'] = self::activity($v['id']);
+                $integral = StoreProductAttrValueModel::where('product_id', $v['id'])->field('integral')->find();
+                $list[$k]['integral'] = $integral['integral'] ?? 0;
             }
         }
         return self::setLevelPrice($list, $uid);
@@ -216,6 +218,8 @@ class StoreProduct extends BaseModel
         if (!empty($list)) {
             foreach ($list as $k => $v) {
                 $list[$k]['activity'] = self::activity($v['id']);
+                $integral = StoreProductAttrValueModel::where('product_id', $v['id'])->field('integral')->find();
+                $list[$k]['integral'] = $integral['integral'] ?? 0;
             }
         }
         return self::setLevelPrice($list, $uid);
@@ -262,6 +266,8 @@ class StoreProduct extends BaseModel
         if (!empty($list)) {
             foreach ($list as $k => $v) {
                 $list[$k]['activity'] = self::activity($v['id']);
+                $integral = StoreProductAttrValueModel::where('product_id', $v['id'])->field('integral')->find();
+                $list[$k]['integral'] = $integral['integral'] ?? 0;
             }
         }
         return self::setLevelPrice($list, $uid);
@@ -325,6 +331,8 @@ class StoreProduct extends BaseModel
         if (count($data) > 0) {
             foreach ($data as $k => $v) {
                 $data[$k]['activity'] = self::activity($v['id']);
+                $integral = StoreProductAttrValueModel::where('product_id', $v['id'])->field('integral')->find();
+                $list[$k]['integral'] = $integral['integral'] ?? 0;
             }
         }
         return $data;

app/models/user/UserRecharge.php

@@ -55,6 +55,22 @@ class UserRecharge extends BaseModel
         $add_time = time();
         return self::create(compact('order_id', 'uid', 'price', 'recharge_type', 'paid', 'add_time', 'give_price'));
     }
+    /**
+     * 创建充值订单
+     * @param $uid
+     * @param $price
+     * @param string $recharge_type
+     * @param int $paid
+     * @return UserRecharge|bool|\think\Model
+     */
+    public static function addyy($uid, $price, $recharge_type = 'weixin', $give_price = 0, $paid = 0)
+    {
+        $order_id = self::getNewOrderId($uid);
+        if (!$order_id) return self::setErrorInfo('订单生成失败！');
+        $type = 2;
+        $add_time = time();
+        return self::create(compact('order_id', 'uid', 'price', 'recharge_type', 'paid', 'add_time', 'give_price', 'type'));
+    }
 
     /**
      * 生成充值订单号
@@ -107,18 +123,34 @@ class UserRecharge extends BaseModel
     public static function rechargeSuccess($orderId)
     {
         $order = self::where('order_id', $orderId)->where('paid', 0)->find();
+
         if (!$order) return false;
-        $user = User::getUserInfo($order['uid']);
-        self::beginTrans();
-        $price = bcadd($order['price'], $order['give_price'], 2);
-        $res1 = self::where('order_id', $order['order_id'])->update(['paid' => 1, 'pay_time' => time()]);
-        $mark = '成功充值余额' . floatval($order['price']) . '元' . ($order['give_price'] ? ',赠送' . $order['give_price'] . '元' : '');
-        $res2 = UserBill::income('用户余额充值', $order['uid'], 'now_money', 'recharge', $order['price'], $order['id'], $user['now_money'], $mark);
-        $res3 = User::edit(['now_money' => bcadd($user['now_money'], $price, 2)], $order['uid'], 'uid');
-        $res = $res1 && $res2 && $res3;
-        self::checkTrans($res);
-        event('RechargeSuccess', [$order]);
-        return $res;
+        if ($order['type'] < 2){
+            $user = User::getUserInfo($order['uid']);
+            self::beginTrans();
+            $price = bcadd($order['price'], $order['give_price'], 2);
+            $res1 = self::where('order_id', $order['order_id'])->update(['paid' => 1, 'pay_time' => time()]);
+            $mark = '成功充值余额' . floatval($order['price']) . '元' . ($order['give_price'] ? ',赠送' . $order['give_price'] . '元' : '');
+            $res2 = UserBill::income('用户余额充值', $order['uid'], 'now_money', 'recharge', $order['price'], $order['id'], $user['now_money'], $mark);
+            $res3 = User::edit(['now_money' => bcadd($user['now_money'], $price, 2)], $order['uid'], 'uid');
+            $res = $res1 && $res2 && $res3;
+            self::checkTrans($res);
+            event('RechargeSuccess', [$order]);
+            return $res;
+        }else{
+            $user = User::getUserInfo($order['uid']);
+            self::beginTrans();
+            $price = bcadd($order['price'], $order['give_price'], 2);
+            $res1 = self::where('order_id', $order['order_id'])->update(['paid' => 1, 'pay_time' => time()]);
+            $mark = '成功充值预约券' . floatval($order['price']) . '元' . ($order['give_price'] ? ',赠送' . $order['give_price'] . '元' : '');
+            $res2 = UserBill::income('用户预约券充值', $order['uid'], 'integral', 'add_anticipate', $order['price'], $order['id'], $user['anticipate'], $mark);
+            $res3 = User::edit(['anticipate' => bcadd($user['anticipate'], $price, 2)], $order['uid'], 'uid');
+            $res = $res1 && $res2 && $res3;
+            self::checkTrans($res);
+            event('RechargeSuccess', [$order]);
+            return $res;
+        }
+
     }
 
     /**

route/api/route.php

@@ -252,6 +252,7 @@ Route::group(function () {
 
     //门店列表
     Route::get('store_list', 'PublicController/store_list')->name('storeList');
+    Route::get('store_details/:id', 'PublicController/store_details')->name('store_details');
     //获取城市列表
     Route::get('city_list', 'PublicController/city_list')->name('cityList');
     //拼团数据