efats

src/main/java/com/yunzhi/shigongli/common/Callback.java

@@ -0,0 +1,8 @@
+package com.yunzhi.shigongli.common;
+
+/**
+ * 实现类似 JS 回调函数的功能
+ */
+public abstract class Callback {
+    public abstract void next() throws Exception;
+}

src/main/java/com/yunzhi/shigongli/common/Constants.java

@@ -33,9 +33,15 @@ public class Constants {
     public final static String ACCOUNT_SETTLEMENT = "settlement";   // 佣金结算
 
     // 系统模块
-    public final static String TARGET_ORDER = "order";  // 订单
-    public final static String TARGET_HOTEL = "hotel";  // 民宿
-    public final static String TARGET_SHOP = "shop";    // 商铺
+    public final static String TARGET_ORDER = "order";                  // 订单
+    public final static String TARGET_HOTEL = "hotel";                  // 民宿
+    public final static String TARGET_SHOP = "shop";                    // 商铺
+    public final static String TARGET_SHOP_PACKAGE = "shop_package";    // 商铺套餐
+    public final static String TARGET_TOURIST = "tourist";                // 景点
+
+    // 商品套餐类型
+    public final static String PACKAGE_NORMAL = "normal";           // 普通套餐
+    public final static String PACKAGE_CASH = "cash_coupon";        // 现金抵用券
 
     // 推荐人类型
     public final static String RECOMMEND_SHOP = "shop";     // 商铺

src/main/java/com/yunzhi/shigongli/common/CurrentContext.java

@@ -14,9 +14,12 @@ public class CurrentContext {
         tokenParamHolder.set(tokenParam);
     }
 
+    public static void clear() {
+        tokenParamHolder.remove();
+    }
+
     public static Map<String, Object> getTokenParam() {
         Map<String, Object> params = tokenParamHolder.get();
-        tokenParamHolder.remove();
         return params;
     }
 }

src/main/java/com/yunzhi/shigongli/common/ResponseBean.java

@@ -39,6 +39,8 @@ public class ResponseBean<T> implements Serializable {
             responseBean.message = msgs[0];
         }
 
+        CurrentContext.clear();
+
         return responseBean;
     }
 
@@ -56,6 +58,8 @@ public class ResponseBean<T> implements Serializable {
             responseBean.data = datas[0];
         }
 
+        CurrentContext.clear();
+
         return responseBean;
     }
 

src/main/java/com/yunzhi/shigongli/controller/TaHotelWorkerController.java

@@ -7,6 +7,7 @@ import com.yunzhi.shigongli.common.BaseController;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
 import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.vo.HotelWorkerListVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -49,18 +50,13 @@ public class TaHotelWorkerController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taHotelWorker",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = HotelWorkerListVO.class)
     public ResponseBean taHotelWorkerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                           @ApiParam("民宿ID") @RequestParam(value ="hotelId", required = false) String hotelId) throws Exception{
 
-        IPage<TaHotelWorker> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaHotelWorker> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(!StringUtils.isEmpty(hotelId), "hotel_id", hotelId);
-        queryWrapper.gt("status", Constants.STATUS_DELETED);
-        queryWrapper.orderByDesc("create_date");
-
-        IPage<TaHotelWorker> result = iTaHotelWorkerService.page(pg, queryWrapper);
+        IPage<HotelWorkerListVO> pg = new Page<>(pageNum, pageSize);
+        IPage<HotelWorkerListVO> result = iTaHotelWorkerService.getPagedListBy(pg, hotelId);
         return ResponseBean.success(result);
     }
 

src/main/java/com/yunzhi/shigongli/controller/TaNotificationController.java

@@ -0,0 +1,163 @@
+package com.yunzhi.shigongli.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.shigongli.common.BaseController;
+import com.yunzhi.shigongli.common.Constants;
+import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.entity.TaNotification;
+import com.yunzhi.shigongli.service.ITaNotificationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 通知公告 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+
+@Api(tags = "通知公告")
+@RestController
+@RequestMapping("/")
+public class TaNotificationController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaNotificationController.class);
+
+    @Autowired
+    public ITaNotificationService iTaNotificationService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{plat}/notification",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taPvList(@ApiParam(value = "客户端", allowableValues = "wx,admin") String client,
+                                 @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                 @ApiParam(value = "发布状态") @RequestParam(value ="status", required = false) Integer status) throws Exception{
+
+        IPage<TaNotification> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaNotification> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("wx".equals(client), "status", Constants.STATUS_NORMAL);
+        queryWrapper.eq(null != status && "admin".equals(client), "status", status);
+        queryWrapper.gt(null == status && "admin".equals(client), "status", Constants.STATUS_DELETED);
+        queryWrapper.orderByDesc("weight");
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaNotification> result = iTaNotificationService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taNotification 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/notification",method= RequestMethod.POST)
+    @ApiOperation(value="新增通知公告", notes = "新增通知公告", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taPvAdd(@ApiParam("保存内容") @RequestBody TaNotification taNotification) throws Exception{
+
+        if (null == taNotification || StringUtils.isEmpty(taNotification.getContent())) {
+            return ResponseBean.error("通知内容不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taNotification.setStatus(Constants.STATUS_READY);
+
+        if (iTaNotificationService.save(taNotification)){
+            return ResponseBean.success(taNotification);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/notification/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taPvDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaNotificationService.removeLogicById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taNotification 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/notification/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taPvUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                        @ApiParam("更新内容") @RequestBody TaNotification taNotification) throws Exception {
+        if (null == taNotification || StringUtils.isEmpty(taNotification.getContent())) {
+            return ResponseBean.error("通知内容不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 只允许修改内容
+        TaNotification notification = iTaNotificationService.getById(id);
+        notification.setContent(taNotification.getContent());
+
+        if (iTaNotificationService.updateById(notification)){
+            return ResponseBean.success(notification);
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 发布通知公告
+     * @param id  实体ID
+     * @return
+     */
+    @RequestMapping(value="/admin/notification/{id}/publish",method= RequestMethod.PUT)
+    @ApiOperation(value="发布通知公告", notes = "发布通知公告", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean publish(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+
+        TaNotification notification = iTaNotificationService.getById(id);
+        notification.setStatus(Constants.STATUS_NORMAL);
+
+        if (iTaNotificationService.updateById(notification)){
+            return ResponseBean.success(notification);
+        }else {
+            return ResponseBean.error("发布失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 取消发布通知公告
+     * @param id  实体ID
+     * @return
+     */
+    @RequestMapping(value="/admin/notification/{id}/unPublish",method= RequestMethod.PUT)
+    @ApiOperation(value="取消发布通知公告", notes = "取消发布通知公告", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean unPublish(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+
+        TaNotification notification = iTaNotificationService.getById(id);
+        notification.setStatus(Constants.STATUS_READY);
+
+        if (iTaNotificationService.updateById(notification)){
+            return ResponseBean.success(notification);
+        }else {
+            return ResponseBean.error("取消发布失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+}

src/main/java/com/yunzhi/shigongli/controller/TaShopController.java

@@ -1,10 +1,13 @@
 package com.yunzhi.shigongli.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.BaseController;
+import com.yunzhi.shigongli.common.Constants;
+import com.yunzhi.shigongli.common.Callback;
 import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.entity.*;
+import com.yunzhi.shigongli.service.*;
 import com.yunzhi.shigongli.vo.ShopListVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -17,10 +20,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import com.yunzhi.shigongli.service.ITaShopService;
-import com.yunzhi.shigongli.entity.TaShop;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
     * 商铺 前端控制器
@@ -41,6 +44,19 @@ public class TaShopController extends BaseController {
     public ITaShopService iTaShopService;
 
 
+    @Autowired
+    public ITaShopImagesService shopImagesService;
+
+    @Autowired
+    public ITaTargetTypeService taTargetTypeService;
+
+    @Autowired
+    public ITaPvService iTaPvService;
+
+    @Autowired
+    public ITaTargetQuotaService targetQuotaService;
+
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -70,6 +86,7 @@ public class TaShopController extends BaseController {
 
         try {
             iTaShopService.createNew(taShop);
+            shopImagesService.updateImages(taShop.getShopId(), taShop.getImageList());
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
@@ -104,6 +121,15 @@ public class TaShopController extends BaseController {
                                         @ApiParam("更新内容") @RequestBody TaShop taShop) throws Exception{
 
         if (iTaShopService.updateById(taShop)){
+            shopImagesService.updateImages(taShop.getShopId(), taShop.getImageList());
+            taTargetTypeService.updateTypes(Constants.TARGET_SHOP, taShop.getShopId(), taShop.getTypeList());
+
+            TaTargetQuota taTargetQuota = targetQuotaService.getByTarget(Constants.TARGET_SHOP, id);
+            taTargetQuota.setUvNum(taShop.getUvNum());
+            taTargetQuota.setPvNum(taShop.getPvNum());
+            taTargetQuota.setLikeNum(taShop.getLikeNum());
+
+            targetQuotaService.updateById(taTargetQuota);
             return ResponseBean.success(iTaShopService.getById(id));
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -114,9 +140,31 @@ public class TaShopController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/taShop/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/{plat}/taShop/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taShopGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        return ResponseBean.success(iTaShopService.getById(id));
+    public ResponseBean taShopGet(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
+                                  @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        TaShop taShop = iTaShopService.getById(id);
+        if (Constants.STATUS_DELETED.equals(taShop.getStatus())) {
+            return ResponseBean.error("当前商铺信息不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaTargetQuota taTargetQuota = targetQuotaService.getByTarget(Constants.TARGET_SHOP, id);
+        taShop.setPvNum(taTargetQuota.getPvNum());
+        taShop.setUvNum(taTargetQuota.getUvNum());
+        taShop.setLikeNum(taTargetQuota.getLikeNum());
+        taShop.setImageList(shopImagesService.getBy(TaShopImages::getShopId, id));
+        taShop.setTypeList(taTargetTypeService.getListBy(Constants.TARGET_SHOP, id));
+        
+        if ("wx".equals(plat)) {
+            try {
+                targetQuotaService.recordPerson(Constants.TARGET_SHOP, id, getCurrentPerson());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        return ResponseBean.success(taShop);
     }
+
 }

src/main/java/com/yunzhi/shigongli/controller/TaShopPackageController.java

@@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.BaseController;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.entity.TaShopPackageSetting;
+import com.yunzhi.shigongli.vo.ShopPackageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -54,26 +57,21 @@ public class TaShopPackageController extends BaseController {
                                           @ApiParam("商铺") @RequestParam(value ="shopId") String shopId) throws Exception{
 
         IPage<TaShopPackage> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaShopPackage> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("shop_id", shopId);
-        queryWrapper.gt("status", Constants.STATUS_DELETED);
-        queryWrapper.orderByDesc("create_date");
-
-        IPage<TaShopPackage> result = iTaShopPackageService.page(pg, queryWrapper);
+        IPage<ShopPackageVO> result = iTaShopPackageService.getProfilePage(pg, shopId);
         return ResponseBean.success(result);
     }
 
     /**
      * 保存对象
-     * @param taShopPackage 实体对象
+     * @param shopPackageVO 实体对象
      * @return
      */
     @RequestMapping(value="/admin/taShopPackage",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taShopPackageAdd(@ApiParam("保存内容") @RequestBody TaShopPackage taShopPackage) throws Exception{
+    public ResponseBean taShopPackageAdd(@ApiParam("保存内容") @RequestBody ShopPackageVO shopPackageVO) throws Exception {
 
-        if (iTaShopPackageService.save(taShopPackage)){
-            return ResponseBean.success(taShopPackage);
+        if (iTaShopPackageService.saveProfile(shopPackageVO)){
+            return ResponseBean.success(shopPackageVO);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -96,15 +94,15 @@ public class TaShopPackageController extends BaseController {
     /**
      * 修改对象
      * @param id  实体ID
-     * @param taShopPackage 实体对象
+     * @param shopPackageVO 实体对象
      * @return
      */
     @RequestMapping(value="/admin/taShopPackage/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean taShopPackageUpdate(@ApiParam("对象ID") @PathVariable String id,
-                                        @ApiParam("更新内容") @RequestBody TaShopPackage taShopPackage) throws Exception{
+                                        @ApiParam("更新内容") @RequestBody ShopPackageVO shopPackageVO) throws Exception{
 
-        if (iTaShopPackageService.updateById(taShopPackage)){
+        if (iTaShopPackageService.updateProfile(shopPackageVO)){
             return ResponseBean.success(iTaShopPackageService.getById(id));
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -118,6 +116,9 @@ public class TaShopPackageController extends BaseController {
     @RequestMapping(value="/admin/taShopPackage/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taShopPackageGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        return ResponseBean.success(iTaShopPackageService.getById(id));
+
+        ShopPackageVO shopPackageVO = iTaShopPackageService.getProfileById(id);
+
+        return ResponseBean.success(shopPackageVO);
     }
 }

src/main/java/com/yunzhi/shigongli/controller/TaShopWorkerController.java

@@ -9,6 +9,7 @@ import com.yunzhi.shigongli.common.ResponseBean;
 import com.yunzhi.shigongli.common.StringUtils;
 import com.yunzhi.shigongli.entity.TaShopWorker;
 import com.yunzhi.shigongli.service.ITaShopWorkerService;
+import com.yunzhi.shigongli.vo.ShopWorkerListVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -49,13 +50,9 @@ public class TaShopWorkerController extends BaseController {
                                          @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                          @ApiParam("商铺ID") @RequestParam(value ="shopId", required = false) String shopId) throws Exception{
 
-        IPage<TaShopWorker> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaShopWorker> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(!StringUtils.isEmpty(shopId), "shop_id", shopId);
-        queryWrapper.gt("status", Constants.STATUS_DELETED);
-        queryWrapper.orderByDesc("create_date");
+        IPage<ShopWorkerListVO> pg = new Page<>(pageNum, pageSize);
 
-        IPage<TaShopWorker> result = iTaShopWorkerService.page(pg, queryWrapper);
+        IPage<ShopWorkerListVO> result = iTaShopWorkerService.getPagedListBy(pg, shopId);
         return ResponseBean.success(result);
     }
 

src/main/java/com/yunzhi/shigongli/controller/TaTouristController.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.BaseController;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.entity.TaTargetQuota;
+import com.yunzhi.shigongli.service.ITaTargetQuotaService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -40,6 +42,9 @@ public class TaTouristController extends BaseController {
     @Autowired
     public ITaTouristService iTaTouristService;
 
+    @Autowired
+    public ITaTargetQuotaService targetQuotaService;
+
 
     /**
      * 分页查询列表
@@ -47,20 +52,19 @@ public class TaTouristController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/{plat}/taTourist",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taTourist",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taTouristList(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
-                                      @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    public ResponseBean taTouristList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                      @ApiParam("景点名称") @RequestParam(value ="touristName", required = false) String touristName,
+                                      @ApiParam("区位") @RequestParam(value ="cityId", required = false) String cityId) throws Exception{
 
         IPage<TaTourist> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaTourist> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("wx".equals(plat), "status", Constants.STATUS_NORMAL);
-        queryWrapper.gt("admin".equals(plat), "status", Constants.STATUS_DELETED);
         queryWrapper.orderByDesc("weight");
         queryWrapper.orderByDesc("create_date");
 
-        IPage<TaTourist> result = iTaTouristService.page(pg, queryWrapper);
+        IPage<TaTourist> result = iTaTouristService.getPagedBy(pg, touristName, cityId);
         return ResponseBean.success(result);
     }
 
@@ -73,7 +77,7 @@ public class TaTouristController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taTouristAdd(@ApiParam("保存内容") @RequestBody TaTourist taTourist) throws Exception{
 
-        if (iTaTouristService.save(taTourist)){
+        if (iTaTouristService.createNew(taTourist)){
             return ResponseBean.success(taTourist);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -106,6 +110,13 @@ public class TaTouristController extends BaseController {
                                         @ApiParam("更新内容") @RequestBody TaTourist taTourist) throws Exception{
 
         if (iTaTouristService.updateById(taTourist)){
+            TaTargetQuota taTargetQuota = targetQuotaService.getByTarget(Constants.TARGET_TOURIST, id);
+
+            taTargetQuota.setPvNum(taTourist.getPvNum());
+            taTargetQuota.setUvNum(taTourist.getUvNum());
+            taTargetQuota.setLikeNum(taTourist.getLikeNum());
+            targetQuotaService.updateById(taTargetQuota);
+
             return ResponseBean.success(iTaTouristService.getById(id));
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -116,9 +127,28 @@ public class TaTouristController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/taTourist/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/{plat}/taTourist/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taTouristGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        return ResponseBean.success(iTaTouristService.getById(id));
+    public ResponseBean taTouristGet(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
+                                     @ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TaTourist taTourist = iTaTouristService.getById(id);
+        if (Constants.STATUS_DELETED.equals(taTourist.getStatus())) {
+            return ResponseBean.error("景点不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaTargetQuota taTargetQuota = targetQuotaService.getByTarget(Constants.TARGET_TOURIST, id);
+        taTourist.setPvNum(taTargetQuota.getPvNum());
+        taTourist.setUvNum(taTargetQuota.getUvNum());
+        taTourist.setLikeNum(taTargetQuota.getLikeNum());
+
+        if ("wx".equals(plat)) {
+            try {
+                targetQuotaService.recordPerson(Constants.TARGET_TOURIST, id, getCurrentPerson());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        return ResponseBean.success(taTourist);
     }
 }

src/main/java/com/yunzhi/shigongli/controller/TdCityController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.BaseController;
 import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -40,24 +41,28 @@ public class TdCityController extends BaseController {
     public ITdCityService iTdCityService;
 
 
-//    /**
-//     * 分页查询列表
-//     * @param pageNum
-//     * @param pageSize
-//     * @return
-//     */
-//    @RequestMapping(value="/tdCity",method= RequestMethod.GET)
-//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean tdCityList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-//
-//		    IPage<TdCity> pg = new Page<>(pageNum, pageSize);
-//            QueryWrapper<TdCity> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.orderByDesc("create_date");
-//
-//            IPage<TdCity> result = iTdCityService.page(pg, queryWrapper);
-//            return ResponseBean.success(result);
-//    }
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/city",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean tdCityList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @ApiParam("父级分类") @RequestParam(value ="areaPId", required = false) String areaPId,
+                                   @ApiParam("名称") @RequestParam(value ="areaName", required = false) String areaName) throws Exception{
+
+        IPage<TdCity> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TdCity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(!StringUtils.isEmpty(areaPId),"area_p_id", areaPId);
+        queryWrapper.like(!StringUtils.isEmpty(areaName), "area_name","%"+areaName+"%");
+        queryWrapper.orderByAsc("area_id");
+
+        IPage<TdCity> result = iTdCityService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
 //
 //    /**
 //     * 保存对象

src/main/java/com/yunzhi/shigongli/controller/TdDietMarkController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.BaseController;
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,25 +40,27 @@ public class TdDietMarkController extends BaseController {
     @Autowired
     public ITdDietMarkService iTdDietMarkService;
 
-//
-//    /**
-//     * 分页查询列表
-//     * @param pageNum
-//     * @param pageSize
-//     * @return
-//     */
-//    @RequestMapping(value="/admin/tdDietMark",method= RequestMethod.GET)
-//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean tdDietMarkList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-//
-//		    IPage<TdDietMark> pg = new Page<>(pageNum, pageSize);
-//            QueryWrapper<TdDietMark> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.orderByDesc("create_date");
-//
-//            IPage<TdDietMark> result = iTdDietMarkService.page(pg, queryWrapper);
-//            return ResponseBean.success(result);
-//    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/dietMark",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean tdDietMarkList(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable(value ="client") String client,
+                                       @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+
+        IPage<TdDietMark> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TdDietMark> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+        queryWrapper.orderByDesc("sort");
+
+        IPage<TdDietMark> result = iTdDietMarkService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
 //
 //    /**
 //     * 保存对象

src/main/java/com/yunzhi/shigongli/entity/TaNotification.java

@@ -0,0 +1,53 @@
+package com.yunzhi.shigongli.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 通知公告
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaNotification对象", description="通知公告")
+public class TaNotification implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "搜索ID")
+    @TableId(value = "notice_id", type = IdType.UUID)
+    private String noticeId;
+
+    @ApiModelProperty(value = "发布人")
+    private String createPerson;
+
+    @ApiModelProperty(value = "发布时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "通知类型")
+    private String noticeType;
+
+    @ApiModelProperty(value = "通知内容")
+    private String content;
+
+    @ApiModelProperty(value = "状态")
+    @TableField("`status`")
+    private Integer status;
+
+    @ApiModelProperty(value = "权重")
+    private Integer weight;
+}

src/main/java/com/yunzhi/shigongli/entity/TaShop.java

@@ -3,8 +3,12 @@ package com.yunzhi.shigongli.entity;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -40,6 +44,9 @@ public class TaShop implements Serializable {
     @ApiModelProperty(value = "所属区")
     private String cityId;
 
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
     @ApiModelProperty(value = "定位")
     private String locaton;
 
@@ -61,20 +68,30 @@ public class TaShop implements Serializable {
     @ApiModelProperty(value = "服务评分")
     private BigDecimal serviceScore;
 
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
     @ApiModelProperty(value = "点赞数")
+    @TableField(exist = false)
     private Integer likeNum;
 
     @ApiModelProperty(value = "浏览量")
+    @TableField(exist = false)
     private Integer pvNum;
 
     @ApiModelProperty(value = "用户数")
+    @TableField(exist = false)
     private Integer uvNum;
 
-    @ApiModelProperty(value = "状态")
-    private Integer status;
-
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime createDate;
+    @ApiModelProperty(value = "图片列表")
+    @TableField(exist = false)
+    private List<TaShopImages> imageList;
 
+    @ApiModelProperty(value = "分类标签")
+    @TableField(exist = false)
+    private List<TaTargetType> typeList;
 
 }

src/main/java/com/yunzhi/shigongli/entity/TaShopPackageSetting.java

@@ -37,7 +37,7 @@ public class TaShopPackageSetting implements Serializable {
     private Integer platformRate;
 
     @ApiModelProperty(value = "参与攻略")
-    private Integer isStrategy;
+    private Boolean isStrategy;
 
     @ApiModelProperty(value = "推荐等级")
     private String strategyLevel;

src/main/java/com/yunzhi/shigongli/entity/TaTargetDietMark.java

@@ -0,0 +1,42 @@
+package com.yunzhi.shigongli.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 资源时刻表
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaTargetDietMark对象", description="资源时刻表")
+public class TaTargetDietMark implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "序号")
+    @TableId(value = "mark_no", type = IdType.AUTO)
+    private Integer markNo;
+
+    @ApiModelProperty(value = "类型ID")
+    private String markId;
+
+    @ApiModelProperty(value = "资源类型")
+    private String targetType;
+
+    @ApiModelProperty(value = "对象ID")
+    private String targetId;
+
+}

src/main/java/com/yunzhi/shigongli/entity/TaTargetQuota.java

@@ -0,0 +1,50 @@
+package com.yunzhi.shigongli.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 资源指标集
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaTargetQuota对象", description="资源指标集")
+public class TaTargetQuota implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "targetNo")
+    @TableId(value = "target_no", type = IdType.AUTO)
+    private Integer targetNo;
+
+    @ApiModelProperty(value = "访问对象类型")
+    private String targetType;
+
+    @ApiModelProperty(value = "访问对象ID")
+    private String targetId;
+
+    @ApiModelProperty(value = "点赞数")
+    private Integer likeNum;
+
+    @ApiModelProperty(value = "浏览量")
+    private Integer pvNum;
+
+    @ApiModelProperty(value = "用户数")
+    private Integer uvNum;
+
+}

src/main/java/com/yunzhi/shigongli/entity/TaTargetType.java

@@ -0,0 +1,43 @@
+package com.yunzhi.shigongli.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 资源分类表
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaTargetType对象", description="资源分类表")
+public class TaTargetType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "序号")
+    @TableId(value = "type_no", type = IdType.AUTO)
+    private Integer typeNo;
+
+    @ApiModelProperty(value = "类型ID")
+    private String typeId;
+
+    @ApiModelProperty(value = "资源类型")
+    private String targetType;
+
+    @ApiModelProperty(value = "对象ID")
+    private String targetId;
+
+}

src/main/java/com/yunzhi/shigongli/entity/TaTourist.java

@@ -2,6 +2,8 @@ package com.yunzhi.shigongli.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -48,15 +50,6 @@ public class TaTourist implements Serializable {
     @ApiModelProperty(value = "地址")
     private String address;
 
-    @ApiModelProperty(value = "点赞数")
-    private Integer likeNum;
-
-    @ApiModelProperty(value = "浏览量")
-    private Integer pvNum;
-
-    @ApiModelProperty(value = "用户数")
-    private Integer uvNum;
-
     @ApiModelProperty(value = "权重")
     private Integer weight;
 
@@ -70,4 +63,16 @@ public class TaTourist implements Serializable {
     private LocalDateTime createDate;
 
 
+    @ApiModelProperty(value = "点赞数")
+    @TableField(exist = false)
+    private Integer likeNum;
+
+    @ApiModelProperty(value = "浏览量")
+    @TableField(exist = false)
+    private Integer pvNum;
+
+    @ApiModelProperty(value = "用户数")
+    @TableField(exist = false)
+    private Integer uvNum;
+
 }

src/main/java/com/yunzhi/shigongli/entity/TdCity.java

@@ -29,13 +29,22 @@ public class TdCity implements Serializable {
     @TableId(value = "area_id", type = IdType.INPUT)
     private String areaId;
 
+    @ApiModelProperty(value = "名称")
     private String areaName;
 
+    @ApiModelProperty(value = "父级ID")
     private String areaPId;
 
+    @ApiModelProperty(value = "等级")
     private String areaLevel;
 
+    @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "经度")
+    private String lng;
+
+    @ApiModelProperty(value = "纬度")
+    private String lat;
 
 }

src/main/java/com/yunzhi/shigongli/mapper/TaHotelWorkerMapper.java

@@ -1,8 +1,11 @@
 package com.yunzhi.shigongli.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaHotelWorker;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.vo.HotelWorkerListVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaHotelWorkerMapper extends BaseMapper<TaHotelWorker> {
 
+    IPage<HotelWorkerListVO> getPagedListBy(IPage<HotelWorkerListVO> pg, @Param("hotelId") String hotelId);
 }

src/main/java/com/yunzhi/shigongli/mapper/TaNotificationMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.shigongli.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.entity.TaNotification;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 通知公告 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Mapper
+public interface TaNotificationMapper extends BaseMapper<TaNotification> {
+
+}

src/main/java/com/yunzhi/shigongli/mapper/TaShopMapper.java

@@ -19,4 +19,6 @@ import org.apache.ibatis.annotations.Param;
 public interface TaShopMapper extends BaseMapper<TaShop> {
 
     IPage<ShopListVO> getPageListBy(IPage<ShopListVO> pg, @Param("shopName") String shopName, @Param("phone") String phone);
+
+    int updatePVNum(@Param("phone") String id);
 }

src/main/java/com/yunzhi/shigongli/mapper/TaShopPackageMapper.java

@@ -1,8 +1,11 @@
 package com.yunzhi.shigongli.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaShopPackage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.vo.ShopPackageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaShopPackageMapper extends BaseMapper<TaShopPackage> {
 
+    IPage<ShopPackageVO> getProfilePage(IPage<TaShopPackage> pg, @Param("shopId") String shopId);
 }

src/main/java/com/yunzhi/shigongli/mapper/TaShopWorkerMapper.java

@@ -1,8 +1,11 @@
 package com.yunzhi.shigongli.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaShopWorker;
+import com.yunzhi.shigongli.vo.ShopWorkerListVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaShopWorkerMapper extends BaseMapper<TaShopWorker> {
 
+    IPage<ShopWorkerListVO> getPagedListBy(IPage<ShopWorkerListVO> pg, @Param("shopId") String shopId);
 }

src/main/java/com/yunzhi/shigongli/mapper/TaTargetDietMarkMapper.java

@@ -0,0 +1,22 @@
+package com.yunzhi.shigongli.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.entity.TaTargetDietMark;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源时刻表 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Mapper
+public interface TaTargetDietMarkMapper extends BaseMapper<TaTargetDietMark> {
+
+    List<TaTargetDietMark> getListBy(@Param("targetType") String targetType, @Param("targetId") String targetId);
+}

src/main/java/com/yunzhi/shigongli/mapper/TaTargetQuotaMapper.java

@@ -0,0 +1,20 @@
+package com.yunzhi.shigongli.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.entity.TaTargetQuota;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 资源类型表 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Mapper
+public interface TaTargetQuotaMapper extends BaseMapper<TaTargetQuota> {
+
+    int increaseQuota(@Param("quota") String quota, @Param("targetType") String targetType, @Param("targetId") String targetId);
+}

src/main/java/com/yunzhi/shigongli/mapper/TaTargetTypeMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.shigongli.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.entity.TaTargetType;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 资源类型表 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Mapper
+public interface TaTargetTypeMapper extends BaseMapper<TaTargetType> {
+
+}

src/main/java/com/yunzhi/shigongli/mapper/TaTouristMapper.java

@@ -1,8 +1,10 @@
 package com.yunzhi.shigongli.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaTourist;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaTouristMapper extends BaseMapper<TaTourist> {
 
+    IPage<TaTourist> getPagedBy(IPage<TaTourist> pg, @Param("touristName") String touristName, @Param("cityId") String cityId);
 }

src/main/java/com/yunzhi/shigongli/mapper/TaUvMapper.java

@@ -3,6 +3,7 @@ package com.yunzhi.shigongli.mapper;
 import com.yunzhi.shigongli.entity.TaUv;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaUvMapper extends BaseMapper<TaUv> {
 
+    TaUv getByTargetAndPerson(@Param("targetType") String targetType, @Param("targetId") String targetId, @Param("personId") String personId);
 }

src/main/java/com/yunzhi/shigongli/service/ITaHotelWorkerService.java

@@ -1,6 +1,8 @@
 package com.yunzhi.shigongli.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaHotelWorker;
+import com.yunzhi.shigongli.vo.HotelWorkerListVO;
 
 
 /**
@@ -13,4 +15,5 @@ import com.yunzhi.shigongli.entity.TaHotelWorker;
  */
 public interface ITaHotelWorkerService extends IBaseService<TaHotelWorker> {
 
+    IPage<HotelWorkerListVO> getPagedListBy(IPage<HotelWorkerListVO> pg, String hotelId);
 }

src/main/java/com/yunzhi/shigongli/service/ITaNotificationService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.shigongli.service;
+
+import com.yunzhi.shigongli.entity.TaNotification;
+
+
+/**
+ * <p>
+ * 通知公告 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+public interface ITaNotificationService extends IBaseService<TaNotification> {
+
+}

src/main/java/com/yunzhi/shigongli/service/ITaPvService.java

@@ -1,5 +1,7 @@
 package com.yunzhi.shigongli.service;
 
+import com.yunzhi.shigongli.common.Callback;
+import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.entity.TaPv;
 
 
@@ -13,4 +15,5 @@ import com.yunzhi.shigongli.entity.TaPv;
  */
 public interface ITaPvService extends IBaseService<TaPv> {
 
+    void newRecord(TaPv taPv, Callback cb) throws Exception;
 }

src/main/java/com/yunzhi/shigongli/service/ITaShopImagesService.java

@@ -2,6 +2,8 @@ package com.yunzhi.shigongli.service;
 
 import com.yunzhi.shigongli.entity.TaShopImages;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.yunzhi.shigongli.entity.TaShopImages;
  */
 public interface ITaShopImagesService extends IBaseService<TaShopImages> {
 
+    void updateImages(String shopId, List<TaShopImages> imageList) throws Exception;
 }

src/main/java/com/yunzhi/shigongli/service/ITaShopPackageService.java

@@ -1,6 +1,8 @@
 package com.yunzhi.shigongli.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaShopPackage;
+import com.yunzhi.shigongli.vo.ShopPackageVO;
 
 
 /**
@@ -13,4 +15,11 @@ import com.yunzhi.shigongli.entity.TaShopPackage;
  */
 public interface ITaShopPackageService extends IBaseService<TaShopPackage> {
 
+    boolean saveProfile(ShopPackageVO shopPackageVO) throws Exception;
+
+    boolean updateProfile(ShopPackageVO shopPackageVO) throws Exception;
+
+    ShopPackageVO getProfileById(String id);
+
+    IPage<ShopPackageVO> getProfilePage(IPage<TaShopPackage> pg, String shopId);
 }

src/main/java/com/yunzhi/shigongli/service/ITaShopService.java

@@ -18,4 +18,6 @@ public interface ITaShopService extends IBaseService<TaShop> {
     IPage<ShopListVO> getPageListBy(IPage<ShopListVO> pg, String shopName, String phone);
 
     void createNew(TaShop taShop) throws Exception;
+
+    boolean updatePVNum(String id);
 }

src/main/java/com/yunzhi/shigongli/service/ITaShopWorkerService.java

@@ -1,7 +1,9 @@
 package com.yunzhi.shigongli.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaShopWorker;
+import com.yunzhi.shigongli.vo.ShopWorkerListVO;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.yunzhi.shigongli.entity.TaShopWorker;
  */
 public interface ITaShopWorkerService extends IBaseService<TaShopWorker> {
 
+    IPage<ShopWorkerListVO> getPagedListBy(IPage<ShopWorkerListVO> pg, String shopId);
 }

src/main/java/com/yunzhi/shigongli/service/ITaTargetDietMarkService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.shigongli.service;
+
+
+import com.yunzhi.shigongli.entity.TaTargetDietMark;
+
+/**
+ * <p>
+ * 资源时刻表 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+public interface ITaTargetDietMarkService extends IBaseService<TaTargetDietMark> {
+
+}

src/main/java/com/yunzhi/shigongli/service/ITaTargetQuotaService.java

@@ -0,0 +1,20 @@
+package com.yunzhi.shigongli.service;
+
+import com.yunzhi.shigongli.entity.TaPerson;
+import com.yunzhi.shigongli.entity.TaTargetQuota;
+
+
+/**
+ * <p>
+ * 访问人 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+public interface ITaTargetQuotaService extends IBaseService<TaTargetQuota> {
+
+    TaTargetQuota getByTarget(String targetType, String targetId);
+
+    void recordPerson(String targetType, String targetId, TaPerson taPerson) throws Exception;
+}

src/main/java/com/yunzhi/shigongli/service/ITaTargetTypeService.java

@@ -0,0 +1,21 @@
+package com.yunzhi.shigongli.service;
+
+import com.yunzhi.shigongli.entity.TaTargetType;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 资源分类表 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+public interface ITaTargetTypeService extends IBaseService<TaTargetType> {
+
+    void updateTypes(String targetType, String targetId, List<TaTargetType> typeList) throws Exception;
+
+    List<TaTargetType> getListBy(String targetType, String targetId);
+}

src/main/java/com/yunzhi/shigongli/service/ITaTouristService.java

@@ -1,6 +1,8 @@
 package com.yunzhi.shigongli.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaTourist;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
@@ -13,4 +15,7 @@ import com.yunzhi.shigongli.entity.TaTourist;
  */
 public interface ITaTouristService extends IBaseService<TaTourist> {
 
+    IPage<TaTourist> getPagedBy(IPage<TaTourist> pg, @Param("touristName") String touristName, @Param("cityId") String cityId);
+
+    boolean createNew(TaTourist taTourist) throws Exception;
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaHotelWorkerServiceImpl.java

@@ -1,9 +1,12 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaHotelWorker;
 import com.yunzhi.shigongli.mapper.TaHotelWorkerMapper;
 import com.yunzhi.shigongli.service.ITaHotelWorkerService;
 
+import com.yunzhi.shigongli.vo.HotelWorkerListVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaHotelWorkerServiceImpl extends BaseServiceImpl<TaHotelWorkerMapper, TaHotelWorker> implements ITaHotelWorkerService {
 
+    @Autowired
+    TaHotelWorkerMapper hotelWorkerMapper;
+
+    @Override
+    public IPage<HotelWorkerListVO> getPagedListBy(IPage<HotelWorkerListVO> pg, String hotelId) {
+        return hotelWorkerMapper.getPagedListBy(pg, hotelId);
+    }
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaNotificationServiceImpl.java

@@ -0,0 +1,19 @@
+package com.yunzhi.shigongli.service.impl;
+
+import com.yunzhi.shigongli.entity.TaNotification;
+import com.yunzhi.shigongli.mapper.TaNotificationMapper;
+import com.yunzhi.shigongli.service.ITaNotificationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 点赞表 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Service
+public class TaNotificationServiceImpl extends BaseServiceImpl<TaNotificationMapper, TaNotification> implements ITaNotificationService {
+
+}

src/main/java/com/yunzhi/shigongli/service/impl/TaPvServiceImpl.java

@@ -1,10 +1,14 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.yunzhi.shigongli.common.Callback;
+import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.entity.TaPv;
 import com.yunzhi.shigongli.mapper.TaPvMapper;
 import com.yunzhi.shigongli.service.ITaPvService;
 
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -17,4 +21,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPvServiceImpl extends BaseServiceImpl<TaPvMapper, TaPv> implements ITaPvService {
 
+    @Async
+    @Override
+    public void newRecord(TaPv taPv, Callback cb) throws Exception {
+        if (save(taPv)) {
+            cb.next();
+        }
+    }
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaShopImagesServiceImpl.java

@@ -1,11 +1,16 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yunzhi.shigongli.common.StringUtils;
 import com.yunzhi.shigongli.entity.TaShopImages;
 import com.yunzhi.shigongli.mapper.TaShopImagesMapper;
 import com.yunzhi.shigongli.service.ITaShopImagesService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 商铺图片 服务实现类
@@ -17,4 +22,36 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaShopImagesServiceImpl extends BaseServiceImpl<TaShopImagesMapper, TaShopImages> implements ITaShopImagesService {
 
+    @Autowired
+    TaShopImagesMapper taShopImagesMapper;
+
+
+    @Override
+    public void updateImages(String shopId, List<TaShopImages> imageList) throws Exception {
+        if (null == imageList) {
+            throw new Exception("未找到图片列表信息");
+        }
+
+        if (StringUtils.isEmpty(shopId)) {
+            throw new Exception("未找到有效的商铺信息");
+        }
+
+        // 先删除所有的
+        removeByShop(shopId);
+
+        // 再插入新记录
+        for (TaShopImages image: imageList) {
+            image.setImageId(null);
+            image.setShopId(shopId);
+        }
+
+        saveBatch(imageList);
+    }
+
+    private boolean removeByShop(String shopId) throws Exception {
+        LambdaQueryWrapper<TaShopImages> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaShopImages::getShopId, shopId);
+
+        return remove(queryWrapper);
+    }
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaShopPackageServiceImpl.java

@@ -1,11 +1,25 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.entity.TaShopPackage;
+import com.yunzhi.shigongli.entity.TaShopPackageSetting;
+import com.yunzhi.shigongli.entity.TaTargetDietMark;
+import com.yunzhi.shigongli.mapper.TaTargetDietMarkMapper;
 import com.yunzhi.shigongli.mapper.TaShopPackageMapper;
+import com.yunzhi.shigongli.mapper.TaShopPackageSettingMapper;
 import com.yunzhi.shigongli.service.ITaShopPackageService;
 
+import com.yunzhi.shigongli.vo.ShopPackageVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 商铺套餐 服务实现类
@@ -17,4 +31,115 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaShopPackageServiceImpl extends BaseServiceImpl<TaShopPackageMapper, TaShopPackage> implements ITaShopPackageService {
 
+    @Autowired
+    TaShopPackageSettingMapper shopPackageSettingMapper;
+
+    @Autowired
+    TaTargetDietMarkMapper dietMarkMapper;
+
+    @Override
+    public boolean saveProfile(ShopPackageVO shopPackageVO) throws Exception {
+        TaShopPackage taShopPackage = new TaShopPackage();
+        TaShopPackageSetting shopPackageSetting = new TaShopPackageSetting();
+
+        BeanUtils.copyProperties(shopPackageVO, taShopPackage);
+        BeanUtils.copyProperties(shopPackageVO, shopPackageSetting);
+
+        save(taShopPackage);
+        shopPackageVO.setPackageId(taShopPackage.getPackageId());
+
+        shopPackageSetting.setPackageId(taShopPackage.getPackageId());
+
+        // 现金券不参与攻略
+        if (Constants.PACKAGE_CASH.equals(taShopPackage.getPackageCategory())) {
+            shopPackageSetting.setIsStrategy(false);
+        } else {
+            shopPackageSetting.setIsStrategy(true);
+        }
+
+        shopPackageSettingMapper.insert(shopPackageSetting);
+
+        List<TaTargetDietMark> dietMarkList = shopPackageVO.getDietMarkList();
+        if (null != dietMarkList) {
+            for (TaTargetDietMark dietMark : dietMarkList) {
+                dietMark.setTargetId(taShopPackage.getPackageId());
+                dietMark.setTargetType(Constants.TARGET_SHOP_PACKAGE);
+
+                dietMarkMapper.insert(dietMark);
+            }
+            shopPackageVO.setDietMarkList(dietMarkList);
+        }
+
+        return true;
+    }
+
+    @Override
+    public boolean updateProfile(ShopPackageVO shopPackageVO) throws Exception {
+        TaShopPackage taShopPackage = new TaShopPackage();
+        TaShopPackageSetting shopPackageSetting = new TaShopPackageSetting();
+
+        BeanUtils.copyProperties(shopPackageVO, taShopPackage);
+        BeanUtils.copyProperties(shopPackageVO, shopPackageSetting);
+
+        updateById(taShopPackage);
+        shopPackageVO.setPackageId(taShopPackage.getPackageId());
+
+        shopPackageSetting.setPackageId(taShopPackage.getPackageId());
+
+        // 现金券不参与攻略
+        if (Constants.PACKAGE_CASH.equals(taShopPackage.getPackageCategory())) {
+            shopPackageSetting.setIsStrategy(false);
+        } else {
+            shopPackageSetting.setIsStrategy(true);
+        }
+        shopPackageSettingMapper.updateById(shopPackageSetting);
+
+        // 先删除
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("target_type", Constants.TARGET_SHOP_PACKAGE);
+        columnMap.put("target_id", taShopPackage.getPackageId());
+        dietMarkMapper.deleteByMap(columnMap);
+
+        // 再插入
+        List<TaTargetDietMark> dietMarkList = shopPackageVO.getDietMarkList();
+        if (null != dietMarkList) {
+            for (TaTargetDietMark dietMark : dietMarkList) {
+                dietMark.setTargetId(taShopPackage.getPackageId());
+                dietMark.setTargetType(Constants.TARGET_SHOP_PACKAGE);
+
+                dietMarkMapper.insert(dietMark);
+            }
+            shopPackageVO.setDietMarkList(dietMarkList);
+        }
+
+        return true;
+    }
+
+    @Override
+    public ShopPackageVO getProfileById(String id) {
+        ShopPackageVO shopPackageVO = new ShopPackageVO();
+
+        // 先查询基本信息
+        TaShopPackage taShopPackage = getById(id);
+        BeanUtils.copyProperties(taShopPackage, shopPackageVO);
+
+        // 再查配置信息
+        LambdaQueryWrapper<TaShopPackageSetting> query1 = new LambdaQueryWrapper<>();
+        query1.eq(TaShopPackageSetting::getPackageId, id);
+        TaShopPackageSetting shopPackageSetting = shopPackageSettingMapper.selectOne(query1);
+        if (null != shopPackageSetting) {
+            BeanUtils.copyProperties(shopPackageSetting, shopPackageVO);
+        }
+
+        //
+        List<TaTargetDietMark> dietMarkList = dietMarkMapper.getListBy(Constants.TARGET_SHOP_PACKAGE, id);
+        shopPackageVO.setDietMarkList(dietMarkList);
+
+        return shopPackageVO;
+    }
+
+    @Override
+    public IPage<ShopPackageVO> getProfilePage(IPage<TaShopPackage> pg, String shopId) {
+        return baseMapper.getProfilePage(pg, shopId);
+    }
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaShopServiceImpl.java

@@ -1,17 +1,20 @@
 package com.yunzhi.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yunzhi.shigongli.entity.TaShop;
-import com.yunzhi.shigongli.entity.TaShopAccount;
-import com.yunzhi.shigongli.mapper.TaShopAccountMapper;
-import com.yunzhi.shigongli.mapper.TaShopMapper;
+import com.yunzhi.shigongli.common.Constants;
+import com.yunzhi.shigongli.entity.*;
+import com.yunzhi.shigongli.mapper.*;
 import com.yunzhi.shigongli.service.ITaShopService;
 
 import com.yunzhi.shigongli.vo.ShopListVO;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * <p>
  * 商铺 服务实现类
@@ -29,6 +32,15 @@ public class TaShopServiceImpl extends BaseServiceImpl<TaShopMapper, TaShop> imp
     @Autowired
     TaShopAccountMapper taShopAccountMapper;
 
+    @Autowired
+    TaShopImagesMapper imagesMapper;
+
+    @Autowired
+    TaTargetTypeMapper targetTypeMapper;
+
+    @Autowired
+    TaTargetQuotaMapper taTargetQuotaMapper;
+
     @Override
     public IPage<ShopListVO> getPageListBy(IPage<ShopListVO> pg, String shopName, String phone) {
         return taShopMapper.getPageListBy(pg, shopName, phone);
@@ -43,5 +55,41 @@ public class TaShopServiceImpl extends BaseServiceImpl<TaShopMapper, TaShop> imp
         account.setShopId(taShop.getShopId());
 
         taShopAccountMapper.insert(account);
+
+        // 指标表
+        TaTargetQuota taTargetQuota = new TaTargetQuota();
+        taTargetQuota.setTargetType(Constants.TARGET_SHOP);
+        taTargetQuota.setTargetId(taShop.getShopId());
+        taTargetQuota.setLikeNum(taShop.getLikeNum());
+        taTargetQuota.setPvNum(taShop.getPvNum());
+        taTargetQuota.setUvNum(taShop.getUvNum());
+        taTargetQuotaMapper.insert(taTargetQuota);
+
+        // 图片
+        if (null != taShop.getImageList()) {
+            for (TaShopImages image: taShop.getImageList()) {
+                image.setShopId(taShop.getShopId());
+                imagesMapper.insert(image);
+            }
+        }
+
+        // 分类标签
+        if (null != taShop.getTypeList()) {
+            for (TaTargetType type: taShop.getTypeList()) {
+                type.setTargetType(Constants.TARGET_SHOP);
+                type.setTypeId(taShop.getShopId());
+                targetTypeMapper.insert(type);
+            }
+        }
+    }
+
+    @Override
+    public boolean updatePVNum(String id) {
+        try {
+            return taShopMapper.updatePVNum(id) > 0;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaShopWorkerServiceImpl.java

@@ -1,9 +1,12 @@
 package com.yunzhi.shigongli.service.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaShopWorker;
 import com.yunzhi.shigongli.mapper.TaShopWorkerMapper;
 import com.yunzhi.shigongli.service.ITaShopWorkerService;
+import com.yunzhi.shigongli.vo.ShopWorkerListVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaShopWorkerServiceImpl extends BaseServiceImpl<TaShopWorkerMapper, TaShopWorker> implements ITaShopWorkerService {
 
+    @Autowired
+    TaShopWorkerMapper shopWorkerMapper;
+
+    @Override
+    public IPage<ShopWorkerListVO> getPagedListBy(IPage<ShopWorkerListVO> pg, String shopId) {
+        return shopWorkerMapper.getPagedListBy(pg, shopId);
+    }
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaTargetDietMarkServiceImpl.java

@@ -0,0 +1,19 @@
+package com.yunzhi.shigongli.service.impl;
+
+import com.yunzhi.shigongli.entity.TaTargetDietMark;
+import com.yunzhi.shigongli.mapper.TaTargetDietMarkMapper;
+import com.yunzhi.shigongli.service.ITaTargetDietMarkService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 资源时刻表 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Service
+public class TaTargetDietMarkServiceImpl extends BaseServiceImpl<TaTargetDietMarkMapper, TaTargetDietMark> implements ITaTargetDietMarkService {
+
+}

src/main/java/com/yunzhi/shigongli/service/impl/TaTargetQuotaServiceImpl.java

@@ -0,0 +1,73 @@
+package com.yunzhi.shigongli.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yunzhi.shigongli.entity.TaPerson;
+import com.yunzhi.shigongli.entity.TaPv;
+import com.yunzhi.shigongli.entity.TaTargetQuota;
+import com.yunzhi.shigongli.entity.TaUv;
+import com.yunzhi.shigongli.mapper.TaPvMapper;
+import com.yunzhi.shigongli.mapper.TaTargetQuotaMapper;
+import com.yunzhi.shigongli.mapper.TaUvMapper;
+import com.yunzhi.shigongli.service.ITaTargetQuotaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 访问人 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Service
+public class TaTargetQuotaServiceImpl extends BaseServiceImpl<TaTargetQuotaMapper, TaTargetQuota> implements ITaTargetQuotaService {
+
+    @Autowired
+    TaPvMapper taPvMapper;
+
+    @Autowired
+    TaUvMapper taUvMapper;
+
+    @Override
+    public TaTargetQuota getByTarget(String targetType, String targetId) {
+        LambdaQueryWrapper<TaTargetQuota> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaTargetQuota::getTargetType, targetType);
+        queryWrapper.eq(TaTargetQuota::getTargetId, targetId);
+
+        return getOne(queryWrapper);
+    }
+
+    @Async
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void recordPerson(String targetType, String targetId, TaPerson taPerson) throws Exception {
+        LocalDateTime now = LocalDateTime.now();
+        String personId = taPerson.getPersonId();
+
+        // pv
+        TaPv taPv = new TaPv();
+        taPv.setTargetType(targetType);
+        taPv.setTargetId(targetId);
+        taPv.setPersonId(personId);
+        taPv.setCreateDate(now);
+        taPvMapper.insert(taPv);
+        baseMapper.increaseQuota("pv_num", targetType, targetId);
+
+        // uv
+        TaUv taUv = taUvMapper.getByTargetAndPerson(targetType, targetId, personId);
+        if (null == taUv) {
+            taUv = new TaUv();
+            taUv.setTargetType(targetType);
+            taUv.setTargetId(targetId);
+            taUv.setPersonId(personId);
+            taUv.setCreateDate(now);
+            taUvMapper.insert(taUv);
+            baseMapper.increaseQuota("uv_num", targetType, targetId);
+        }
+    }
+}

src/main/java/com/yunzhi/shigongli/service/impl/TaTargetTypeServiceImpl.java

@@ -0,0 +1,61 @@
+package com.yunzhi.shigongli.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.entity.TaShopImages;
+import com.yunzhi.shigongli.entity.TaTargetType;
+import com.yunzhi.shigongli.mapper.TaTargetTypeMapper;
+import com.yunzhi.shigongli.service.ITaTargetTypeService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资源分类表 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Service
+public class TaTargetTypeServiceImpl extends BaseServiceImpl<TaTargetTypeMapper, TaTargetType> implements ITaTargetTypeService {
+
+    @Override
+    public void updateTypes(String targetType, String targetId, List<TaTargetType> typeList) throws Exception {
+        if (null == typeList) {
+            throw new Exception("未找到图片列表信息");
+        }
+
+        if (StringUtils.isEmpty(targetType) || StringUtils.isEmpty(targetId)) {
+            throw new Exception("分类标签对象信息不完整");
+        }
+
+        // 先删除所有的
+        removeByTarget(targetType, targetId);
+
+        // 再插入新记录
+        for (TaTargetType item : typeList) {
+            item.setTargetType(targetType);
+            item.setTypeId(targetId);
+        }
+
+        saveBatch(typeList);
+    }
+
+    @Override
+    public List<TaTargetType> getListBy(String targetType, String targetId) {
+        LambdaQueryWrapper<TaTargetType> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaTargetType::getTargetType, targetType);
+        queryWrapper.eq(TaTargetType::getTargetId, targetId);
+        return list(queryWrapper);
+    }
+
+    private boolean removeByTarget(String targetType, String targetId) throws Exception {
+        LambdaQueryWrapper<TaTargetType> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaTargetType::getTargetType, targetType);
+        queryWrapper.eq(TaTargetType::getTargetId, targetId);
+
+        return remove(queryWrapper);
+    }
+}

src/main/java/com/yunzhi/shigongli/service/impl/TaTouristServiceImpl.java

@@ -1,10 +1,16 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.common.Constants;
+import com.yunzhi.shigongli.entity.TaTargetQuota;
 import com.yunzhi.shigongli.entity.TaTourist;
+import com.yunzhi.shigongli.mapper.TaTargetQuotaMapper;
 import com.yunzhi.shigongli.mapper.TaTouristMapper;
 import com.yunzhi.shigongli.service.ITaTouristService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -17,4 +23,25 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaTouristServiceImpl extends BaseServiceImpl<TaTouristMapper, TaTourist> implements ITaTouristService {
 
+    @Autowired
+    TaTargetQuotaMapper quotaMapper;
+
+    @Override
+    public IPage<TaTourist> getPagedBy(IPage<TaTourist> pg, String touristName, String cityId) {
+        return baseMapper.getPagedBy(pg, touristName, cityId);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean createNew(TaTourist taTourist) throws Exception {
+        boolean isSuccess = save(taTourist);
+        if (!isSuccess) return false;
+
+        TaTargetQuota taTargetQuota = new TaTargetQuota();
+        taTargetQuota.setTargetType(Constants.TARGET_TOURIST);
+        taTargetQuota.setTargetId(taTourist.getTouristId());
+        int row = quotaMapper.insert(taTargetQuota);
+
+        return row > 0;
+    }
 }

src/main/java/com/yunzhi/shigongli/vo/HotelWorkerListVO.java

@@ -0,0 +1,18 @@
+package com.yunzhi.shigongli.vo;
+
+import com.yunzhi.shigongli.entity.TaHotelWorker;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel(description = "民宿员工列表")
+@Data
+public class HotelWorkerListVO extends TaHotelWorker {
+
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+}

src/main/java/com/yunzhi/shigongli/vo/ShopPackageVO.java

@@ -0,0 +1,31 @@
+package com.yunzhi.shigongli.vo;
+
+import com.yunzhi.shigongli.entity.TaShopPackage;
+import com.yunzhi.shigongli.entity.TaTargetDietMark;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@ApiModel(description = "商品套餐全字段")
+@Data
+public class ShopPackageVO extends TaShopPackage {
+
+    @ApiModelProperty(value = "引流分成;单位千分之一")
+    private Integer trafficRate;
+
+    @ApiModelProperty(value = "平台分成;单位千分之一")
+    private Integer platformRate;
+
+    @ApiModelProperty(value = "参与攻略")
+    private Boolean isStrategy;
+
+    @ApiModelProperty(value = "推荐等级")
+    private String strategyLevel;
+
+    @ApiModelProperty(value = "类别")
+    private List<TaTargetDietMark> dietMarkList;
+
+}

src/main/java/com/yunzhi/shigongli/vo/ShopWorkerListVO.java

@@ -0,0 +1,17 @@
+package com.yunzhi.shigongli.vo;
+
+import com.yunzhi.shigongli.entity.TaShopWorker;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "商铺员工列表")
+@Data
+public class ShopWorkerListVO extends TaShopWorker {
+
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+}

src/main/resources/mapper/TaHotelWorkerMapper.xml

@@ -2,4 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaHotelWorkerMapper">
 
+    <select id="getPagedListBy" resultType="com.yunzhi.shigongli.vo.HotelWorkerListVO">
+        SELECT
+            t.*,
+            s.nick_name,
+            s.avatar
+        FROM
+            ta_hotel_worker t
+                LEFT JOIN ta_person s ON t.person_id = s.person_id
+        WHERE
+            t.`status` &gt; - 1
+          <if test="hotelId != null and hotelId != ''">
+              AND t.hotel_id = #{hotelId}
+          </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaNotificationMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.shigongli.mapper.TaNotificationMapper">
+
+</mapper>

src/main/resources/mapper/TaShopMapper.xml

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaShopMapper">
+    <update id="updatePVNum">
+        UPDATE ta_shop t
+        SET t.pv_num = IFNULL( t.pv_num, 0 ) + 1
+        WHERE
+            t.shop_id = #{id}
+    </update>
 
     <select id="getPageListBy" resultType="com.yunzhi.shigongli.vo.ShopListVO">
         SELECT
@@ -8,7 +14,7 @@
             s.brokerage_charges,
             s.paid_charges,
             s.brokerage_charges - s.paid_charges AS unpaid_charges,
-            m.phone,
+            t.phone,
             ( SELECT count( 1 ) FROM ta_shop_worker a WHERE a.shop_id = t.shop_id AND a.`status` &gt; -1 ) AS worker_num,
             IFNULL(
                     ( SELECT sum( b.charges ) FROM ta_order_sub b WHERE b.shop_id = t.shop_id AND b.`status` &gt; -1 ),
@@ -18,15 +24,15 @@
         FROM
             ta_shop t
                 INNER JOIN ta_shop_account s ON t.shop_id = s.shop_id
-                LEFT JOIN ta_shop_worker m ON t.shop_id = m.shop_id
-                AND m.is_manager = 1
+--                 LEFT JOIN ta_shop_worker m ON t.shop_id = m.shop_id
+--                 AND m.is_manager = 1
         WHERE
             t.`status` &gt; - 1
           <if test="shopName != null and shopName != ''">
               AND t.shop_name LIKE CONCAT( '%', #{shopName}, '%' )
           </if>
           <if test="phone != null and phone != ''">
-              AND m.phone LIKE CONCAT( '%', #{phone}, '%' )
+              AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
           </if>
         ORDER BY
             t.weight DESC,

src/main/resources/mapper/TaShopPackageMapper.xml

@@ -2,4 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaShopPackageMapper">
 
+    <select id="getProfilePage" resultType="com.yunzhi.shigongli.vo.ShopPackageVO">
+        SELECT
+            t.*,
+            s.traffic_rate,
+            s.platform_rate,
+            s.is_strategy,
+            s.strategy_level
+        FROM
+            ta_shop_package t
+                INNER JOIN ta_shop_package_setting s ON t.package_id = s.package_id
+        WHERE
+            t.`status` &gt; - 1
+          <if test="shopId != null and shopId != ''">
+              AND t.shop_id = #{shopId}
+          </if>
+        ORDER BY
+            t.weight DESC,
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaShopWorkerMapper.xml

@@ -2,4 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaShopWorkerMapper">
 
+    <select id="getPagedListBy" resultType="com.yunzhi.shigongli.vo.ShopWorkerListVO">
+        SELECT
+            t.*,
+            s.nick_name,
+            s.avatar
+        FROM
+            ta_shop_worker t
+                LEFT JOIN ta_person s ON t.person_id = s.person_id
+        WHERE
+            t.`status` &gt; - 1
+        <if test="shopId != null and shopId != ''">
+            AND t.shop_id = #{shopId}
+        </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaTargetDietMarkMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.shigongli.mapper.TaTargetDietMarkMapper">
+
+    <select id="getListBy" resultType="com.yunzhi.shigongli.entity.TaTargetDietMark">
+        SELECT
+            *
+        FROM
+            ta_target_diet_mark t
+        WHERE
+            t.target_type = #{targetType}
+          AND t.target_id = #{targetId}
+        ORDER BY
+            t.mark_no ASC
+    </select>
+</mapper>

src/main/resources/mapper/TaTargetQuotaMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.shigongli.mapper.TaTargetQuotaMapper">
+
+    <update id="increaseQuota">
+        UPDATE ta_target_quota
+        SET ${quota} = IFNULL( ${quota}, 0 ) + 1
+        WHERE
+            target_type = #{targetType}
+          AND target_id = #{targetId}
+    </update>
+</mapper>

src/main/resources/mapper/TaTargetTypeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.shigongli.mapper.TaTargetTypeMapper">
+
+</mapper>

src/main/resources/mapper/TaTouristMapper.xml

@@ -2,4 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaTouristMapper">
 
+    <select id="getPagedBy" resultType="com.yunzhi.shigongli.entity.TaTourist">
+        SELECT
+            t.*,
+            s.like_num,
+            s.pv_num,
+            s.uv_num
+        FROM
+            ta_tourist t
+                LEFT JOIN ta_target_quota s ON s.target_type = 'tourist'
+                AND s.target_id = t.tourist_id
+        WHERE
+            t.`status` &gt; - 1
+          <if test="touristName != null and touristName != ''">
+              AND t.tourist_name LIKE CONCAT( '%', #{touristName}, '%' )
+          </if>
+          <if test="cityId != null and cityId != ''">
+              AND t.city_id = #{cityId}
+          </if>
+        ORDER BY
+            t.weight DESC,
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaUvMapper.xml

@@ -2,4 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaUvMapper">
 
+    <select id="getByTargetAndPerson" resultType="com.yunzhi.shigongli.entity.TaUv">
+        SELECT
+            *
+        FROM
+            ta_uv t
+        WHERE
+            t.target_type = #{targetType}
+          AND t.target_id = #{targetId}
+          AND t.person_id = #{personId}
+    </select>
 </mapper>