feats

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

@@ -63,7 +63,8 @@ public class TaExtendContentController extends BaseController {
         QueryWrapper<TaExtendContent> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("target_type", targetType);
         queryWrapper.eq("target_id", targetId);
-        queryWrapper.orderByAsc("sort");
+//        queryWrapper.orderByAsc("sort");
+        queryWrapper.orderByAsc("create_date");
 
         IPage<TaExtendContent> result = iTaExtendContentService.page(pg, queryWrapper);
         return ResponseBean.success(result);

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

@@ -66,16 +66,22 @@ public class TaOrderSubController extends BaseController {
                                        @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @ApiParam("商家名称") @RequestParam(value = "shopName", required = false) String shopName,
                                        @ApiParam("标题") @RequestParam(value = "description", required = false) String description,
-                                       @ApiParam(value = "下单时间", example = "2021-09-01") @RequestParam(value = "createDate", required = false) String createDate) throws Exception{
+                                       @ApiParam(value = "开始时间", example = "2021-09-01") @RequestParam(value = "start", required = false) String start,
+                                       @ApiParam(value = "结束时间", example = "2021-09-30") @RequestParam(value = "end", required = false) String end) throws Exception{
 
         IPage<OrderSubListVO> pg = new Page<>(pageNum, pageSize);
 
-        LocalDateTime date = null;
-        if (!StringUtils.isEmpty(createDate)) {
-            date = DateUtils.from(createDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        LocalDateTime startDate = null;
+        LocalDateTime endDate = null;
+        if (!StringUtils.isEmpty(start)) {
+            startDate = DateUtils.from(start + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
         }
+        if (!StringUtils.isEmpty(end)) {
+            endDate = DateUtils.from(end + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+        }
+
 
-        IPage<OrderSubListVO> result = iTaOrderSubService.getAdminPagedBy(pg, shopName, description, date);
+        IPage<OrderSubListVO> result = iTaOrderSubService.getAdminPagedBy(pg, shopName, description, startDate, endDate);
         return ResponseBean.success(result);
     }
 
@@ -152,73 +158,6 @@ public class TaOrderSubController extends BaseController {
         return ResponseBean.success("操作完成");
     }
 
-//    @PutMapping("/wx/orderSub/{id}/valid")
-//    @ApiOperation(value="订单项目核销", notes = "订单项目核销", httpMethod = "PUT", response = ResponseBean.class)
-//    public ResponseBean valdiation(@ApiParam(value = "订单项目ID") @PathVariable String id) throws Exception {
-//        TaPerson taPerson = getCurrentPerson();
-//        TaOrderSub taOrderSub = iTaOrderSubService.getById(id);
-//        TaOrder taOrder = iTaOrderService.getById(taOrderSub.getOrderId());
-//
-//        if (!taPerson.getPersonId().equals(taOrder.getPersonId())) {
-//            return ResponseBean.error("您不能核销当前套餐", ResponseBean.ERROR_ILLEGAL_PARAMS);
-//        }
-//
-//        if (!Constants.ORDER_PAYED.equals(taOrderSub.getStatus())) {
-//            return ResponseBean.error("套餐未支付或者状态异常", ResponseBean.ERROR_ILLEGAL_PARAMS);
-//        }
-//
-//        iTaOrderSubService.validation(taPerson, taOrder, taOrderSub);
-//
-//        return ResponseBean.success("核销成功");
-//    }
-
-//    /**
-//     * 保存对象
-//     * @param taOrderSub 实体对象
-//     * @return
-//     */
-//    @RequestMapping(value="/wx/taOrderSub",method= RequestMethod.POST)
-//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-//    public ResponseBean taOrderSubAdd(@ApiParam("保存内容") @RequestBody TaOrderSub taOrderSub) throws Exception{
-//
-//        if (iTaOrderSubService.save(taOrderSub)){
-//            return ResponseBean.success(taOrderSub);
-//        }else {
-//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-//
-//    /**
-//     * 根据id删除对象
-//     * @param id  实体ID
-//     */
-//    @RequestMapping(value="/wx/taOrderSub/{id}", method= RequestMethod.DELETE)
-//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-//    public ResponseBean taOrderSubDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        if(iTaOrderSubService.removeLogicById(id)){
-//            return ResponseBean.success("success");
-//        }else {
-//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-
-//    /**
-//     * 修改对象
-//     * @param id  实体ID
-//     * @param taOrderSub 实体对象
-//     * @return
-//     */
-//    @RequestMapping(value="/taOrderSub/{id}",method= RequestMethod.PUT)
-//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-//    public ResponseBean taOrderSubUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-//                                        @ApiParam("更新内容") @RequestBody TaOrderSub taOrderSub) throws Exception{
-//
-//        if (iTaOrderSubService.updateById(taOrderSub)){
-//            return ResponseBean.success(iTaOrderSubService.getById(id));
-//        }else {
-//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
 
     /**
      * 根据id查询对象

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

@@ -66,14 +66,20 @@ public class TaPersonController extends BaseController {
     @RequestMapping(value="/admin/taPerson",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taPersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("昵称") @RequestParam(value ="nickName", required = false) String nickName,
+                                     @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
+                                     @ApiParam("用户类型") @RequestParam(value ="personRole", required = false) String personRole) throws Exception{
+
+        IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(nickName), "nick_name", "%"+nickName+"%");
+        queryWrapper.like(!StringUtils.isEmpty(phone), "phone", "%"+phone+"%");
+        queryWrapper.eq(!StringUtils.isEmpty(personRole), "person_role", personRole);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
 

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

@@ -5,6 +5,7 @@ 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 com.yunzhi.shigongli.entity.TaResource;
 import com.yunzhi.shigongli.service.ITaResourceService;
 import com.yunzhi.shigongli.vo.ResourceListVO;
 import io.swagger.annotations.Api;
@@ -13,10 +14,7 @@ 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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -66,62 +64,14 @@ public class TaResourceController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    @RequestMapping(value="/wx/resource/{targetType}/{targetId}",method= RequestMethod.GET)
+    @ApiOperation(value="获取资源详情", notes = "获取资源详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getList(@ApiParam("资源类型") @PathVariable String targetType,
+                                @ApiParam("资源对象ID") @PathVariable String targetId,
+                                @ApiParam("定位") @RequestParam(value ="location", required = false) String location) throws Exception{
 
-//    /**
-//     * 保存对象
-//     * @param taPv 实体对象
-//     * @return
-//     */
-//    @RequestMapping(value="/taPv",method= RequestMethod.POST)
-//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-//    public ResponseBean taPvAdd(@ApiParam("保存内容") @RequestBody TaPv taPv) throws Exception{
-//
-//        if (iTaPvService.save(taPv)){
-//            return ResponseBean.success(taPv);
-//        }else {
-//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-//
-//    /**
-//     * 根据id删除对象
-//     * @param id  实体ID
-//     */
-//    @RequestMapping(value="/taPv/{id}", method= RequestMethod.DELETE)
-//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-//    public ResponseBean taPvDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        if(iTaPvService.removeLogicById(id)){
-//            return ResponseBean.success("success");
-//        }else {
-//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-//
-//    /**
-//     * 修改对象
-//     * @param id  实体ID
-//     * @param taPv 实体对象
-//     * @return
-//     */
-//    @RequestMapping(value="/taPv/{id}",method= RequestMethod.PUT)
-//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-//    public ResponseBean taPvUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-//                                        @ApiParam("更新内容") @RequestBody TaPv taPv) throws Exception{
-//
-//        if (iTaPvService.updateById(taPv)){
-//            return ResponseBean.success(iTaPvService.getById(id));
-//        }else {
-//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-//
-//    /**
-//     * 根据id查询对象
-//     * @param id  实体ID
-//     */
-//    @RequestMapping(value="/taPv/{id}",method= RequestMethod.GET)
-//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean taPvGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        return ResponseBean.success(iTaPvService.getById(id));
-//    }
+        ResourceListVO resourceListVO = iTaResourceService.getDetailByTarget(targetType, targetId, location);
+
+        return ResponseBean.success(resourceListVO);
+    }
 }

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

@@ -14,14 +14,9 @@ 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.PathVariable;
-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 org.springframework.web.bind.annotation.*;
 import com.yunzhi.shigongli.service.ITaShopAccountLogService;
 import com.yunzhi.shigongli.entity.TaShopAccountLog;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -50,7 +45,7 @@ public class TaShopAccountLogController extends BaseController {
      */
     @RequestMapping(value="/wx/shop/account/{id}/log",method= RequestMethod.GET)
     @ApiOperation(value="获取账户流水", notes = "获取账户流水", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taHotelAccountLogList(@ApiParam("账户ID") @PathVariable String id,
+    public ResponseBean taShopAccountLogList(@ApiParam("账户ID") @PathVariable String id,
                                               @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                               @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                               @ApiParam("账户流水类型") @RequestParam(value ="amountType", required = false) String amountType) throws Exception{

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

@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.*;
 import com.yunzhi.shigongli.entity.*;
 import com.yunzhi.shigongli.service.*;
-import com.yunzhi.shigongli.vo.QrCodeParamsVO;
-import com.yunzhi.shigongli.vo.ResourceFieldVO;
-import com.yunzhi.shigongli.vo.ShopListVO;
+import com.yunzhi.shigongli.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -305,37 +303,74 @@ public class TaShopController extends BaseController {
         return ResponseBean.success(result);
     }
 
-//    /**
-//     * 民宿小程序首页
-//     */
-//    @RequestMapping(value="/wx/hotel/manage/{id}",method= RequestMethod.GET)
-//    @ApiOperation(value="民宿小程序首页", notes = "民宿小程序首页", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean getWxManageHotel(@ApiParam("民宿ID") @PathVariable String id) throws Exception{
-//        TaPerson taPerson = getCurrentPerson();
-//        if (!Constants.TARGET_HOTEL.equals(taPerson.getPersonRole())) {
-//            return ResponseBean.error("请先进行人员身份绑定", ResponseBean.ERROR_ILLEGAL_PARAMS);
-//        }
-//
-//        // 获取所有的民宿信息
-//        List<TaHotel> hotelList = iTaHotelService.getListByPerson(taPerson);
-//        if (null == hotelList || hotelList.size() < 1) {
-//            return ResponseBean.error("数据异常, 未找到关联民宿", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//
-//        Optional<TaHotel> first = hotelList.stream().filter(x -> x.getHotelId().equals(id)).findFirst();
-//        if (!first.isPresent()) {
-//            return ResponseBean.error("数据异常, 未找到关联民宿", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//
-//        // 默认获取第一个店铺信息
-//        TaHotel taHotel = first.get();
-//        TaHotelAccount taHotelAccount = iTaHotelAccountService.getAccountInfoBy(taHotel.getHotelId());
-//
-//        Map<String, Object> result = new HashMap<>();
-//        result.put("hotel", taHotel);
-//        result.put("account", taHotelAccount);
-//
-//        return ResponseBean.success(result);
-//    }
 
+    /**
+     * 商铺订单列表
+     * @param pageNum
+     * @param pageSize
+     * @param shopName
+     * @param description
+     * @param start
+     * @param end
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/admin/taShop/orderSub",method= RequestMethod.GET)
+    @ApiOperation(value="商铺订单列表", notes = "商铺订单列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getShopOrderList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @ApiParam("店铺名称") @RequestParam(value = "shopName", required = false) String shopName,
+                                         @ApiParam("套餐名称") @RequestParam(value = "description", required = false) String description,
+                                         @ApiParam(value = "开始时间", example = "2021-09-01") @RequestParam(value = "start", required = false) String start,
+                                         @ApiParam(value = "结束时间", example = "2021-09-30") @RequestParam(value = "end", required = false) String end) throws Exception {
+        IPage<ShopOrderVO> pg = new Page<>(pageNum, pageSize);
+
+        LocalDateTime startDate = null;
+        LocalDateTime endDate = null;
+        if (!StringUtils.isEmpty(start)) {
+            startDate = DateUtils.from(start + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        }
+        if (!StringUtils.isEmpty(end)) {
+            endDate = DateUtils.from(end + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+        }
+
+        IPage<ShopOrderVO> result = iTaShopService.getShopOrderList(pg, shopName, description, startDate, endDate);
+
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 商铺推广列表
+     * @param pageNum
+     * @param pageSize
+     * @param shopName
+     * @param description
+     * @param start
+     * @param end
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/admin/taShop/commission",method= RequestMethod.GET)
+    @ApiOperation(value="商铺推广列表", notes = "商铺推广列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getShopCommissionList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @ApiParam("店铺名称") @RequestParam(value = "shopName", required = false) String shopName,
+                                         @ApiParam("套餐名称") @RequestParam(value = "description", required = false) String description,
+                                         @ApiParam(value = "开始时间", example = "2021-09-01") @RequestParam(value = "start", required = false) String start,
+                                         @ApiParam(value = "结束时间", example = "2021-09-30") @RequestParam(value = "end", required = false) String end) throws Exception {
+        IPage<ShopCommissionVO> pg = new Page<>(pageNum, pageSize);
+
+        LocalDateTime startDate = null;
+        LocalDateTime endDate = null;
+        if (!StringUtils.isEmpty(start)) {
+            startDate = DateUtils.from(start + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        }
+        if (!StringUtils.isEmpty(end)) {
+            endDate = DateUtils.from(end + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+        }
+
+        IPage<ShopCommissionVO> result = iTaShopService.getCommissionList(pg, shopName, description, startDate, endDate);
+
+        return ResponseBean.success(result);
+    }
 }

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

@@ -0,0 +1,97 @@
+package com.yunzhi.shigongli.controller;
+
+import com.yunzhi.shigongli.common.BaseController;
+import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.entity.TrPersonClick;
+import com.yunzhi.shigongli.service.ITrPersonClickService;
+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.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 用户点击事件埋点 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+
+@Api(tags = "用户点击事件埋点")
+@RestController
+@RequestMapping("/")
+public class TrPersonClickController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TrPersonClickController.class);
+
+    @Autowired
+    public ITrPersonClickService iTrPersonClickService;
+
+
+    /**
+     * 保存对象
+     * @param trPersonClick 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/track/click",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean tdDietMarkAdd(@ApiParam("保存内容") @RequestBody TrPersonClick trPersonClick) throws Exception{
+
+        trPersonClick.setPersonId(getCurrentPerson().getPersonId());
+        trPersonClick.setCreateDate(LocalDateTime.now());
+
+        if (iTrPersonClickService.save(trPersonClick)){
+            return ResponseBean.success(trPersonClick);
+        } else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/admin/tdDietMark/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean tdDietMarkDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTdDietMarkService.removeLogicById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param tdDietMark 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/admin/tdDietMark/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean tdDietMarkUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TdDietMark tdDietMark) throws Exception{
+//
+//        if (iTdDietMarkService.updateById(tdDietMark)){
+//            return ResponseBean.success(iTdDietMarkService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/tdDietMark/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean tdDietMarkGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTdDietMarkService.getById(id));
+//    }
+}

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

@@ -0,0 +1,49 @@
+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="TrPersonClick对象", description="用户点击事件埋点")
+public class TrPersonClick implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "序号")
+    @TableId(value = "track_id", type = IdType.AUTO)
+    private String trackId;
+
+    @ApiModelProperty(value = "人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "父ID")
+    private String page;
+
+    @ApiModelProperty(value = "内容类型")
+    private String eventType;
+
+    @ApiModelProperty(value = "内容对象")
+    private Integer eventParams;
+
+    @ApiModelProperty(value = "创建日期")
+    private LocalDateTime createDate;
+
+}

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

@@ -5,6 +5,7 @@ import com.yunzhi.shigongli.entity.TaOrderSub;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yunzhi.shigongli.vo.MineOrder;
 import com.yunzhi.shigongli.vo.OrderSubListVO;
+import com.yunzhi.shigongli.vo.ShopOrderVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -51,5 +52,12 @@ public interface TaOrderSubMapper extends BaseMapper<TaOrderSub> {
     IPage<OrderSubListVO> getAdminPagedBy(IPage<OrderSubListVO> pg,
                                           @Param("shopName") String shopName,
                                           @Param("description") String description,
-                                          @Param("createDate") LocalDateTime createDate);
+                                          @Param("startDate") LocalDateTime startDate,
+                                          @Param("endDate") LocalDateTime endDate);
+
+    IPage<ShopOrderVO> getShopOrderList(IPage<ShopOrderVO> pg,
+                                        @Param("shopName") String shopName,
+                                        @Param("description") String description,
+                                        @Param("startDate") LocalDateTime startDate,
+                                        @Param("endDate") LocalDateTime endDate);
 }

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

@@ -32,4 +32,6 @@ public interface TaResourceMapper extends BaseMapper<TaResource> {
                                         @Param("location") String location,
                                         @Param("word")  String word,
                                         @Param("targetType") String targetType);
+
+    ResourceListVO getDetailByTarget(@Param("targetType") String targetType, @Param("targetId")  String targetId, @Param("location") String location);
 }

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

@@ -1,7 +1,10 @@
 package com.yunzhi.shigongli.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaShopAccountLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.vo.ShopCommissionVO;
+import com.yunzhi.shigongli.vo.ShopOrderVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +25,11 @@ public interface TaShopAccountLogMapper extends BaseMapper<TaShopAccountLog> {
                             @Param("amountType") String amountType,
                             @Param("start") LocalDateTime start,
                             @Param("end") LocalDateTime end);
+
+    IPage<ShopCommissionVO> getShopAccountList(IPage<ShopCommissionVO> pg,
+                                          @Param("amountType") String amountType,
+                                          @Param("shopName") String shopName,
+                                          @Param("description") String description,
+                                          @Param("startDate") LocalDateTime startDate,
+                                          @Param("endDate") LocalDateTime endDate);
 }

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

@@ -0,0 +1,18 @@
+package com.yunzhi.shigongli.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.entity.TrPersonClick;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 用户点击事件埋点 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Mapper
+public interface TrPersonClickMapper extends BaseMapper<TrPersonClick> {
+
+}

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

@@ -36,5 +36,5 @@ public interface ITaOrderSubService extends IBaseService<TaOrderSub> {
 
     MineOrder getSingleOrderSubOf(TaPerson taPerson, Integer subOrderId);
 
-    IPage<OrderSubListVO> getAdminPagedBy(IPage<OrderSubListVO> pg, String shopName, String description, LocalDateTime createDate);
+    IPage<OrderSubListVO> getAdminPagedBy(IPage<OrderSubListVO> pg, String shopName, String description, LocalDateTime startDate, LocalDateTime endDate);
 }

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

@@ -31,4 +31,6 @@ public interface ITaResourceService extends IBaseService<TaResource> {
     void updateLike(TaLike taLike, int num);
 
     IPage<ResourceListVO> searchList(IPage<ResourceListVO> pg, TaPerson currentPerson, String location, String q, String targetType);
+
+    ResourceListVO getDetailByTarget(String targetType, String targetId, String location);
 }

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

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.entity.TaShop;
 import com.yunzhi.shigongli.vo.ResourceFieldVO;
+import com.yunzhi.shigongli.vo.ShopCommissionVO;
 import com.yunzhi.shigongli.vo.ShopListVO;
+import com.yunzhi.shigongli.vo.ShopOrderVO;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 
@@ -28,4 +31,8 @@ public interface ITaShopService extends IBaseService<TaShop> {
     ResourceFieldVO copyProperties(TaShop taShop);
 
     List<TaShop> getListByPerson(TaPerson taPerson);
+
+    IPage<ShopOrderVO> getShopOrderList(IPage<ShopOrderVO> pg, String shopName, String description, LocalDateTime startDate, LocalDateTime endDate);
+
+    IPage<ShopCommissionVO> getCommissionList(IPage<ShopCommissionVO> pg, String shopName, String description, LocalDateTime startDate, LocalDateTime endDate);
 }

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

@@ -0,0 +1,16 @@
+package com.yunzhi.shigongli.service;
+
+import com.yunzhi.shigongli.entity.TrPersonClick;
+
+
+/**
+ * <p>
+ * 用户点击事件埋点 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+public interface ITrPersonClickService extends IBaseService<TrPersonClick> {
+
+}

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

@@ -62,6 +62,12 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
     @Autowired
     TaVerifyTargetMapper taVerifyTargetMapper;
 
+    @Autowired
+    TaPersonAccountMapper personAccountMapper;
+
+    @Autowired
+    TaPersonAccountLogMapper accountLogMapper;
+
     /**
      * 支付回调
      * @param notifyResult
@@ -94,29 +100,46 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
                 taOrderSubMapper.updateStatusByOrder(orderId, Constants.ORDER_PAYED);
             }
 
+
+            List<TaOrderSub> orderSubList = new ArrayList<>();
+            if (null != taOrder) {
+                orderSubList = taOrderSubMapper.getListByOrder(taOrder.getOrderId());
+            } else {
+                orderSubList.add(taOrderSub);
+            }
+
             // 发送核销码
-            generateVerfiedRecords(taOrder, taOrderSub, taPerson);
+            generateVerfiedRecords(taPerson, orderSubList);
+
+            // 返现
+            processCallback(orderPay, taPerson, orderSubList, taOrder, taOrderSub);
 
             PaySuccessEvent evt = new PaySuccessEvent(this, orderPay);
             eventPublisher.publishEvent(evt);
         }
     }
 
+    private void processCallback(TaOrderPay originPay, TaPerson taPerson, List<TaOrderSub> orderSubList, TaOrder taOrder, TaOrderSub taOrderSub) throws Exception {
+        if (null == orderSubList || orderSubList.size() < 1) {
+            throw new Exception("未找到有效的订单项目记录");
+        }
+
+        Integer cashback = orderSubList.stream().mapToInt(TaOrderSub::getCashback).reduce(Integer::sum).getAsInt();
+
+        TaOrderPay orderPay = null != taOrder ? createByOrder(taOrder) : createByOrderSub(taOrderSub, taPerson);
+        orderPay.setDescription("返现");
+        orderPay.setCharges(cashback);
+
+        wxPayUtils.refund(originPay, orderPay);
+    }
+
     /**
      * 发放核销码
-     * @param taOrder
-     * @param taOrderSub
      * @param taPerson
+     * @param orderSubList
      * @throws Exception
      */
-    private void generateVerfiedRecords(TaOrder taOrder, TaOrderSub taOrderSub, TaPerson taPerson) throws Exception {
-        List<TaOrderSub> orderSubList = new ArrayList<>();
-        if (null != taOrder) {
-            orderSubList = taOrderSubMapper.getListByOrder(taOrder.getOrderId());
-        } else {
-            orderSubList.add(taOrderSub);
-        }
-
+    private void generateVerfiedRecords(TaPerson taPerson, List<TaOrderSub> orderSubList) throws Exception {
         LocalDateTime now = LocalDateTime.now();
 
         // 循环发放
@@ -184,6 +207,12 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
         boolean isSuccess = WxPayConstants.RefundStatus.SUCCESS.equals(reqInfo.getRefundStatus());
 
         TaOrderPay orderPay = getById(reqInfo.getOutTradeNo());
+        if ("返现".equals(orderPay.getDescription())) {
+            cashback(orderPay);
+            return;
+        }
+
+
         orderPay.setPayDate(DateUtils.from(reqInfo.getSuccessTime(), "yyyyMMddHHmmss"));
         orderPay.setStatus(isSuccess ? Constants.PAY_SUCCESS : Constants.PAY_FAIL);
         orderPay.setMessage(isSuccess ? null : reqInfo.getRefundStatus());
@@ -205,6 +234,28 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
         }
     }
 
+    private void cashback(TaOrderPay taOrderPay) throws Exception {
+        String orderId = taOrderPay.getOrderId();
+        String orderSubId = taOrderPay.getSubOrderId();
+        TaOrder taOrder = taOrderMapper.selectById(orderId);
+        Integer cashback = taOrderPay.getCharges();
+        boolean isOrderSub = !StringUtils.isEmpty(orderSubId);
+
+        TaPersonAccount personAccount = personAccountMapper.getByPerson(taOrder.getPersonId());
+        personAccountMapper.updateCashBack(personAccount.getAccountId(), cashback);
+
+        TaPersonAccountLog accountLog = new TaPersonAccountLog();
+        accountLog.setAccountId(personAccount.getAccountId());
+        accountLog.setPersonId(taOrder.getPersonId());
+        accountLog.setAmountType(Constants.ACCOUNT_CASHBACK);
+        accountLog.setAmount(cashback);
+        accountLog.setSignType(Constants.ACCOUNT_INCOME);
+        accountLog.setTargetType(isOrderSub ? Constants.TARGET_ORDER_SUB : Constants.TARGET_ORDER);
+        accountLog.setTargetId(isOrderSub ? orderSubId : orderId);
+        accountLog.setOrderId(orderId);
+        accountLogMapper.insert(accountLog);
+    }
+
     @Override
     public WxPayMpOrderResult prePay(TaPerson person, TaOrder taOrder) throws Exception {
         TaOrderPay orderPay = createByOrder(taOrder);

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

@@ -141,8 +141,8 @@ public class TaOrderSubServiceImpl extends BaseServiceImpl<TaOrderSubMapper, TaO
     }
 
     @Override
-    public IPage<OrderSubListVO> getAdminPagedBy(IPage<OrderSubListVO> pg, String shopName, String description, LocalDateTime createDate) {
-        return baseMapper.getAdminPagedBy(pg, shopName, description, createDate);
+    public IPage<OrderSubListVO> getAdminPagedBy(IPage<OrderSubListVO> pg, String shopName, String description, LocalDateTime startDate, LocalDateTime endDate) {
+        return baseMapper.getAdminPagedBy(pg, shopName, description, startDate, endDate);
     }
 
     /**

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

@@ -38,9 +38,6 @@ public class TaPersonAccountServiceImpl extends BaseServiceImpl<TaPersonAccountM
     @Autowired
     TaPersonAccountMapper personAccountMapper;
 
-    @Autowired
-    TaPersonAccountMapper accountMapper;
-
     @Autowired
     TaPersonAccountLogMapper accountLogMapper;
 
@@ -48,32 +45,32 @@ public class TaPersonAccountServiceImpl extends BaseServiceImpl<TaPersonAccountM
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void cashback(TaOrderPay taOrderPay) throws Exception {
-        String orderId = taOrderPay.getOrderId();
-        String orderSubId = taOrderPay.getSubOrderId();
-        TaOrder taOrder = taOrderMapper.selectById(orderId);
-        Integer cashback = 0;
-        boolean isOrderSub = !StringUtils.isEmpty(orderSubId);
-        if (isOrderSub) {
-            TaOrderSub taOrderSub = orderSubMapper.selectById(orderSubId);
-            cashback = taOrderSub.getCashback();
-        } else {
-            List<TaOrderSub> orderSubList = orderSubMapper.getListByOrder(taOrder.getOrderId());
-            cashback = orderSubList.stream().mapToInt(TaOrderSub::getCashback).reduce(Integer::sum).getAsInt();
-        }
-
-        TaPersonAccount personAccount = personAccountMapper.getByPerson(taOrder.getPersonId());
-        accountMapper.updateCashBack(personAccount.getAccountId(), cashback);
-
-        TaPersonAccountLog accountLog = new TaPersonAccountLog();
-        accountLog.setAccountId(personAccount.getAccountId());
-        accountLog.setPersonId(taOrder.getPersonId());
-        accountLog.setAmountType(Constants.ACCOUNT_CASHBACK);
-        accountLog.setAmount(cashback);
-        accountLog.setSignType(Constants.ACCOUNT_INCOME);
-        accountLog.setTargetType(isOrderSub ? Constants.TARGET_ORDER_SUB : Constants.TARGET_ORDER);
-        accountLog.setTargetId(isOrderSub ? orderSubId : orderId);
-        accountLog.setOrderId(orderId);
-        accountLogMapper.insert(accountLog);
+//        String orderId = taOrderPay.getOrderId();
+//        String orderSubId = taOrderPay.getSubOrderId();
+//        TaOrder taOrder = taOrderMapper.selectById(orderId);
+//        Integer cashback = 0;
+//        boolean isOrderSub = !StringUtils.isEmpty(orderSubId);
+//        if (isOrderSub) {
+//            TaOrderSub taOrderSub = orderSubMapper.selectById(orderSubId);
+//            cashback = taOrderSub.getCashback();
+//        } else {
+//            List<TaOrderSub> orderSubList = orderSubMapper.getListByOrder(taOrder.getOrderId());
+//            cashback = orderSubList.stream().mapToInt(TaOrderSub::getCashback).reduce(Integer::sum).getAsInt();
+//        }
+//
+//        TaPersonAccount personAccount = personAccountMapper.getByPerson(taOrder.getPersonId());
+//        personAccountMapper.updateCashBack(personAccount.getAccountId(), cashback);
+//
+//        TaPersonAccountLog accountLog = new TaPersonAccountLog();
+//        accountLog.setAccountId(personAccount.getAccountId());
+//        accountLog.setPersonId(taOrder.getPersonId());
+//        accountLog.setAmountType(Constants.ACCOUNT_CASHBACK);
+//        accountLog.setAmount(cashback);
+//        accountLog.setSignType(Constants.ACCOUNT_INCOME);
+//        accountLog.setTargetType(isOrderSub ? Constants.TARGET_ORDER_SUB : Constants.TARGET_ORDER);
+//        accountLog.setTargetId(isOrderSub ? orderSubId : orderId);
+//        accountLog.setOrderId(orderId);
+//        accountLogMapper.insert(accountLog);
     }
 
 }

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

@@ -34,7 +34,7 @@ public class TaPersonRecommenderServiceImpl extends BaseServiceImpl<TaPersonReco
     @Async
     @Override
     public void addNewRecommender(String personId, String fromType, String recommender) throws Exception {
-        if (isExists(personId, fromType, recommender)) {
+        if (isExists(personId)) {
             throw new Exception("当前客户还有未到期的推荐人");
         }
 
@@ -43,7 +43,7 @@ public class TaPersonRecommenderServiceImpl extends BaseServiceImpl<TaPersonReco
         if (Constants.RECOMMEND_SHOP.equals(fromType)) {
             configCode = Constants.CONF_SHOP_RECOMMEND_VALID_DAYS;
         }
-        if (Constants.RECOMMEND_SHOP.equals(fromType)) {
+        if (Constants.RECOMMEND_HOTEL.equals(fromType)) {
             configCode = Constants.CONF_HOTEL_RECOMMEND_VALID_DAYS;
         }
 
@@ -68,15 +68,10 @@ public class TaPersonRecommenderServiceImpl extends BaseServiceImpl<TaPersonReco
         save(personRecommender);
     }
 
-    private boolean isExists(String personId, String fromType, String recommender) {
-        LocalDateTime now = LocalDateTime.now();
+    private boolean isExists(String personId) {
         LambdaQueryWrapper<TaPersonRecommender> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TaPersonRecommender::getPersonId, personId)
-                .eq(TaPersonRecommender::getFromType, fromType)
-                .eq(TaPersonRecommender::getRecommender, recommender)
-                .eq(TaPersonRecommender::getStatus, Constants.STATUS_NORMAL)
-                .gt(TaPersonRecommender::getCreateDate, LocalDateTime.now())
-                .lt(TaPersonRecommender::getExpireDate, now);
+                .eq(TaPersonRecommender::getStatus, Constants.STATUS_NORMAL);
 
         return count(queryWrapper) > 0;
     }

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

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.StringUtils;
 import com.yunzhi.shigongli.entity.TaPerson;
+import com.yunzhi.shigongli.entity.TaPersonAccount;
+import com.yunzhi.shigongli.mapper.TaPersonAccountMapper;
 import com.yunzhi.shigongli.mapper.TaPersonMapper;
 import com.yunzhi.shigongli.service.ITaPersonService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -20,6 +23,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPersonServiceImpl extends BaseServiceImpl<TaPersonMapper, TaPerson> implements ITaPersonService {
 
+    @Autowired
+    TaPersonAccountMapper personAccountMapper;
+
     @Override
     public TaPerson getByOpenid(String openid) {
         if (StringUtils.isEmpty(openid)) {
@@ -41,6 +47,11 @@ public class TaPersonServiceImpl extends BaseServiceImpl<TaPersonMapper, TaPerso
             taPerson = new TaPerson();
             taPerson.setOpenid(openid);
             save(taPerson);
+
+            TaPersonAccount taPersonAccount = new TaPersonAccount();
+            taPersonAccount.setPersonId(taPerson.getPersonId());
+            personAccountMapper.insert(taPersonAccount);
+
             // 插入过程会有默认字段写入
             taPerson = getById(taPerson.getPersonId());
         }

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

@@ -137,6 +137,11 @@ public class TaResourceServiceImpl extends BaseServiceImpl<TaResourceMapper, TaR
         return baseMapper.getSearchList(pg, personId, location, word, targetType);
     }
 
+    @Override
+    public ResourceListVO getDetailByTarget(String targetType, String targetId, String location) {
+        return baseMapper.getDetailByTarget(targetType, targetId, location);
+    }
+
     private TaSearch createSearchLog(String word, String personId) {
         TaSearch taSearch = new TaSearch();
         taSearch.setPersonId(personId);

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

@@ -9,7 +9,9 @@ import com.yunzhi.shigongli.mapper.*;
 import com.yunzhi.shigongli.service.ITaShopService;
 
 import com.yunzhi.shigongli.vo.ResourceFieldVO;
+import com.yunzhi.shigongli.vo.ShopCommissionVO;
 import com.yunzhi.shigongli.vo.ShopListVO;
+import com.yunzhi.shigongli.vo.ShopOrderVO;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +19,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -45,6 +48,12 @@ public class TaShopServiceImpl extends BaseServiceImpl<TaShopMapper, TaShop> imp
     @Autowired
     TaResourceMapper taTargetQuotaMapper;
 
+    @Autowired
+    TaOrderSubMapper taOrderSubMapper;
+
+    @Autowired
+    TaShopAccountLogMapper shopAccountLogMapper;
+
     @Override
     public IPage<ShopListVO> getPageListBy(IPage<ShopListVO> pg, String shopName, String phone) {
         return taShopMapper.getPageListBy(pg, shopName, phone);
@@ -115,4 +124,14 @@ public class TaShopServiceImpl extends BaseServiceImpl<TaShopMapper, TaShop> imp
     public List<TaShop> getListByPerson(TaPerson taPerson) {
         return taShopMapper.getListByPerson(taPerson.getPersonId());
     }
+
+    @Override
+    public IPage<ShopOrderVO> getShopOrderList(IPage<ShopOrderVO> pg, String shopName, String description, LocalDateTime startDate, LocalDateTime endDate) {
+        return taOrderSubMapper.getShopOrderList(pg, shopName, description, startDate, endDate);
+    }
+
+    @Override
+    public IPage<ShopCommissionVO> getCommissionList(IPage<ShopCommissionVO> pg, String shopName, String description, LocalDateTime startDate, LocalDateTime endDate) {
+        return shopAccountLogMapper.getShopAccountList(pg, Constants.ACCOUNT_COMMISSION, shopName, description, startDate, endDate);
+    }
 }

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

@@ -0,0 +1,19 @@
+package com.yunzhi.shigongli.service.impl;
+
+import com.yunzhi.shigongli.entity.TrPersonClick;
+import com.yunzhi.shigongli.mapper.TrPersonClickMapper;
+import com.yunzhi.shigongli.service.ITrPersonClickService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户点击事件埋点 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Service
+public class TrPersonClickServiceImpl extends BaseServiceImpl<TrPersonClickMapper, TrPersonClick> implements ITrPersonClickService {
+
+}

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

@@ -0,0 +1,48 @@
+package com.yunzhi.shigongli.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "商铺推广列表")
+@Data
+public class ShopCommissionVO {
+
+    @ApiModelProperty(value = "日志ID")
+    private Integer logId;
+
+    @ApiModelProperty(value = "店铺ID")
+    private String shopId;
+
+    @ApiModelProperty(value = "店铺名称")
+    private String shopName;
+
+    @ApiModelProperty(value = "订单ID")
+    private String orderId;
+
+    @ApiModelProperty(value = "子订单ID")
+    private String subOrderId;
+
+    @ApiModelProperty(value = "套餐ID")
+    private String packageId;
+
+    @ApiModelProperty(value = "套餐名称")
+    private String description;
+
+    @ApiModelProperty(value = "人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "人员昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "人员手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "订单金额")
+    private Integer charges;
+
+    @ApiModelProperty(value = "推广收入")
+    private Integer commissionCharge;
+
+}

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

@@ -0,0 +1,44 @@
+package com.yunzhi.shigongli.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "商铺订单列表")
+@Data
+public class ShopOrderVO {
+
+    @ApiModelProperty(value = "店铺ID")
+    private String shopId;
+
+    @ApiModelProperty(value = "店铺名称")
+    private String shopName;
+
+    @ApiModelProperty(value = "套餐ID")
+    private String packageId;
+
+    @ApiModelProperty(value = "套餐名称")
+    private String description;
+
+    @ApiModelProperty(value = "下单金额")
+    private Integer charges;
+
+    @ApiModelProperty(value = "下单数量")
+    private Integer amount;
+
+    @ApiModelProperty(value = "返现金额")
+    private Integer cashback;
+
+    @ApiModelProperty(value = "已核销金额")
+    private Integer verfiedCharge;
+
+    @ApiModelProperty(value = "待核销金额")
+    private Integer unVerfiedCharge;
+
+    @ApiModelProperty(value = "被提点金额")
+    private Integer commissionCharge;
+
+    @ApiModelProperty(value = "退款金额")
+    private Integer refundCharge;
+}

src/main/resources/application.yml

@@ -48,13 +48,13 @@ aliyun:
 ###
 weixin:
   miniapp:
-    appid: wx06a7372d48d56843
-    secret: ead0c7b1dd40ce828b1fd9bf18183584
+    appid: wx835627a9b9b3932a
+    secret: 51cc2b26c1628ae098f05a3ba8e6f6f4
     token:
     aesKey:
     msgDataFormat: JSON
   pay:
-    appId: wx06a7372d48d56843
+    appId: wx835627a9b9b3932a
     mchId: 1612121997
     mchKey: fUbYPldU5bUCYRl97vMv69JQujsJ8dj5
     subAppId:
@@ -71,8 +71,7 @@ amap:
 
 sysBiz:
   miniapp:
-      shopPage: pages/index/index
-#    shopPage: pages/details/foodDetails/foodDetails
+    shopPage: pages/details/foodDetails/foodDetails
 
 ###
 spring:

src/main/resources/mapper/TaOrderSubMapper.xml

@@ -141,10 +141,48 @@
           <if test="description != null and description != ''">
               AND t.description LIKE CONCAT( '%', #{description}, '%' )
           </if>
-          <if test="createDate != null">
-              AND t.create_date &gt;= #{createDate}
+          <if test="startDate != null">
+              AND t.create_date &gt;= #{startDate}
+          </if>
+          <if test="endDate != null">
+            AND t.create_date &lt;= #{endDate}
           </if>
         ORDER BY
             t.create_date DESC
     </select>
+    <select id="getShopOrderList" resultType="com.yunzhi.shigongli.vo.ShopOrderVO">
+        SELECT
+            t.shop_id,
+            t.package_id,
+            s.shop_name,
+            t.description,
+            sum( t.charges ) AS charges,
+            sum( t.amount ) AS amount,
+            sum( t.cashback ) AS cashback,
+            sum( IF ( t.is_verified = 1, t.charges, 0 ) ) AS verfied_charge,
+            sum( t.commission_charge ) AS commission_charge,
+            sum( IF ( t.`status` = 2, t.charges, 0 ) ) AS refund_charge
+        FROM
+            ta_order_sub t
+            INNER JOIN ta_shop s ON s.shop_id = t.shop_id
+        WHERE
+            t.`status` > - 1
+          <if test="shopName != null and shopName != ''">
+              AND s.shop_name LIKE CONCAT( '%', #{shopName}, '%' )
+          </if>
+          <if test="description != null and description != ''">
+              AND t.description LIKE CONCAT( '%', #{description}, '%' )
+          </if>
+          <if test="startDate != null">
+              AND t.create_date &gt;= #{startDate}
+          </if>
+          <if test="endDate != null">
+              AND t.create_date &lt;= #{endDate}
+          </if>
+        GROUP BY
+            t.shop_id,
+            t.package_id
+        ORDER BY
+            sum( t.charges ) DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonRecommenderMapper.xml

@@ -9,8 +9,6 @@
             ta_person_recommender t
         WHERE
             t.person_id = #{personId}
-          AND t.create_date < now( )
-          AND t.expire_date > now( )
           AND t.`status` = 1
     </select>
 </mapper>

src/main/resources/mapper/TaShopAccountLogMapper.xml

@@ -12,4 +12,41 @@
           AND t.amount_type = #{amountType}
           AND t.create_date BETWEEN #{start} AND #{end}
     </select>
+    <select id="getShopAccountList" resultType="com.yunzhi.shigongli.vo.ShopCommissionVO">
+        SELECT
+            t.log_id,
+            t.shop_id,
+            m.shop_name,
+            s.order_id,
+            s.sub_order_id,
+            s.package_id,
+            n.description,
+            p.person_id,
+            p.nick_name,
+            p.phone,
+            s.charges,
+            t.amount as commission_charge
+        FROM
+            ta_shop_account_log t
+            INNER JOIN ta_order_sub s ON s.sub_order_id = t.sub_order_id
+            INNER JOIN ta_shop m ON m.shop_id = t.shop_id
+            INNER JOIN ta_order n ON n.order_id = t.order_id
+            INNER JOIN ta_person p ON p.person_id = n.person_id
+        WHERE
+            t.amount_type = #{amountType}
+          <if test="shopName != null and shopName != ''">
+              AND m.shop_name LIKE CONCAT( '%', #{shopName}, '%' )
+          </if>
+          <if test="description != null and description != ''">
+              AND s.description LIKE CONCAT( '%', #{description}, '%' )
+          </if>
+          <if test="startDate != null">
+              AND t.create_date &gt;= #{startDate}
+          </if>
+          <if test="endDate != null">
+              AND t.create_date &lt;= #{endDate}
+          </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaShopPackageMapper.xml

@@ -45,12 +45,16 @@
             (
                 SELECT
                     t.*,
+                    c.area_name,
+                    d.area_name as area_p_name,
                     fn_distance ( #{location}, s.locaton ) AS distance,
                     ( s.sweet_score + s.environment_score + s.service_score ) / 3 AS score,
                     IF ( m.save_id IS NULL, 0, 1 ) AS is_saved
                 FROM
                     ta_shop_package t
                         INNER JOIN ta_shop s ON s.shop_id = t.shop_id
+                        LEFT JOIN td_city c on c.area_id = s.city_id
+                        LEFT JOIN td_city d on d.area_id = c.area_p_id
                         LEFT JOIN ta_save m ON m.target_type = #{targetType}
                         AND m.target_id = t.package_id
                         AND m.person_id = #{personId}

src/main/resources/mapper/TaTargetQuotaMapper.xml

@@ -77,4 +77,16 @@
             IFNULL( w.weight, 0 ) DESC,
             w.distance DESC
     </select>
+    <select id="getDetailByTarget" resultType="com.yunzhi.shigongli.vo.ResourceListVO">
+        SELECT
+            t.*,
+            fn_distance ( #{location}, CONCAT( t.lng, ',', t.lat ) ) AS distance,
+            0 AS is_saved
+        FROM
+            ta_resource t
+        WHERE
+            t.target_type = #{targetType}
+            AND t.target_id = #{targetId}
+            AND t.`status` &gt; -1
+    </select>
 </mapper>

src/main/resources/mapper/TrPersonClickMapper.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.TrPersonClickMapper">
+
+</mapper>