feats

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

@@ -30,6 +30,7 @@ public class Constants {
 
     // 账户金额类型
     public final static String ACCOUNT_CASHBACK = "cashback";       // 返现
+    public final static String ACCOUNT_ORDER = "order";             // 订单
     public final static String ACCOUNT_COMMISSION = "commission";   // 抽成
     public final static String ACCOUNT_SETTLEMENT = "settlement";   // 佣金结算
 

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

@@ -25,7 +25,7 @@ public class JWTUtils {
     private static final Logger log = LoggerFactory.getLogger(JWTUtils.class);
 
     // 过期时间 30 分钟
-    public static final long EXPIRE_TIME = 30 * 60;
+    public static final long EXPIRE_TIME = 30 * 60 * 24;
 
     // 私钥
     static final SecretKey SECRET_KEY = Keys.hmacShaKeyFor(Base64.getEncoder().encode("Yansen is so handsome. He is a good man. Everyone like him !!!".getBytes()));

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

@@ -0,0 +1,53 @@
+package com.yunzhi.shigongli.controller;
+
+import com.yunzhi.shigongli.common.BaseController;
+import com.yunzhi.shigongli.common.DateUtils;
+import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.service.ITaOrderSubService;
+import com.yunzhi.shigongli.service.ITsStatisDailyService;
+import com.yunzhi.shigongli.vo.StatisDailyVO;
+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;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "查询统计")
+@RestController
+@RequestMapping("/")
+public class StatisticsController  extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysUserController.class);
+
+    @Autowired
+    ITsStatisDailyService iTsStatisDailyService;
+
+    @RequestMapping(value="/admin/statis/summary",method= RequestMethod.GET)
+    @ApiOperation(value="当前用户", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean statisSummary() {
+        Map<String, Integer> result = iTsStatisDailyService.statisSummary();
+
+        return ResponseBean.success(result);
+    }
+
+    @RequestMapping(value="/admin/statis/{type}/daliy",method= RequestMethod.GET)
+    @ApiOperation(value="首页日活统计", notes = "首页日活统计", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean statisIndexDaliy(@ApiParam("统计类型") @PathVariable String type,
+                                    @ApiParam(value = "开始时间", example = "2021-09-01") @RequestParam(value ="start") String start,
+                                    @ApiParam(value = "结束时间", example = "2021-09-01") @RequestParam(value ="end") String end) {
+        LocalDateTime startDate = DateUtils.from(start + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        LocalDateTime endDate = DateUtils.from(end + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        long days = DateUtils.daysBetween(startDate, endDate);
+
+        List<StatisDailyVO> result = iTsStatisDailyService.getListBy(start, type, days);
+
+        return ResponseBean.success(result);
+    }
+}

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

@@ -20,6 +20,8 @@ import com.yunzhi.shigongli.service.ITaFeedbackService;
 import com.yunzhi.shigongli.entity.TaFeedback;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
     * 意见反馈 前端控制器
@@ -49,14 +51,22 @@ public class TaFeedbackController extends BaseController {
     @RequestMapping(value="/admin/taFeedback",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taFeedbackList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @ApiParam("是否管理首页") @RequestParam(value = "isIndex", required = false) Boolean isIndex ) throws Exception{
+
+        IPage<TaFeedback> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaFeedback> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("create_date");
 
-		    IPage<TaFeedback> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaFeedback> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        if (null != isIndex && isIndex) {
+            // 只查询近3天的, 且未读的数据
+            LocalDateTime dt = LocalDateTime.now().minusDays(3);
+            queryWrapper.ge("create_date", dt);
+            queryWrapper.eq("is_readed", 0);
+        }
 
-            IPage<TaFeedback> result = iTaFeedbackService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaFeedback> result = iTaFeedbackService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -67,7 +77,7 @@ public class TaFeedbackController extends BaseController {
     @RequestMapping(value="/wx/taFeedback",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taFeedbackAdd(@ApiParam("保存内容") @RequestBody TaFeedback taFeedback) throws Exception{
-
+        taFeedback.setIsReaded(false);
         if (iTaFeedbackService.save(taFeedback)){
             return ResponseBean.success(taFeedback);
         }else {
@@ -114,6 +124,15 @@ public class TaFeedbackController extends BaseController {
     @RequestMapping(value="/admin/taFeedback/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taFeedbackGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaFeedbackService.getById(id));
+        TaFeedback feedback = iTaFeedbackService.getById(id);
+
+        // 更新为已读
+        if (null == feedback.getIsReaded() || !feedback.getIsReaded()) {
+            feedback.setIsReaded(true);
+            feedback.setReadDate(LocalDateTime.now());
+            iTaFeedbackService.updateById(feedback);
+        }
+
+        return ResponseBean.success(feedback);
     }
 }

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

@@ -7,11 +7,14 @@ import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 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.TaOrderSub;
 import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.service.ITaOrderPayService;
 import com.yunzhi.shigongli.service.ITaOrderSubService;
+import com.yunzhi.shigongli.service.ITaVerifyTargetService;
 import com.yunzhi.shigongli.vo.OrderItem;
+import com.yunzhi.shigongli.vo.RefundParamsVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -55,6 +58,8 @@ public class TaOrderController extends BaseController {
     @Autowired
     public ITaOrderPayService iTaOrderPayService;
 
+    @Autowired
+    public ITaVerifyTargetService iTaVerifyTargetService;
 
 //    /**
 //     * 分页查询列表
@@ -156,12 +161,22 @@ public class TaOrderController extends BaseController {
     @RequestMapping(value="/wx/order/{id}/refund",method= RequestMethod.DELETE)
     @ApiOperation(value="订单退款", notes = "订单退款", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean taOrderPayCancel(@ApiParam("订单号") @PathVariable String id,
+                                   @ApiParam("退款说明") @RequestBody RefundParamsVO refundParamsVO,
                                    HttpServletRequest request) throws Exception{
         TaOrder taOrder = iTaOrderService.getById(id);
         if (null == taOrder || Constants.STATUS_DELETED.equals(taOrder.getStatus())) {
             return ResponseBean.error("未找到订单信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
+        if (null == refundParamsVO
+                || (StringUtils.isEmpty(refundParamsVO.getRefundReason())
+                && StringUtils.isEmpty(refundParamsVO.getRefundDecription()))) {
+            return ResponseBean.error("请设置退款原因", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taOrder.setRefundReason(refundParamsVO.getRefundReason());
+        taOrder.setRefundDecription(refundParamsVO.getRefundDecription());
+
         if (!Constants.ORDER_PAYED.equals(taOrder.getStatus())) {
             return ResponseBean.error("订单非未支付状态, 不能完成操作", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
@@ -182,12 +197,17 @@ public class TaOrderController extends BaseController {
             throw new Exception("订单存在非支付状态项目, 不能退款");
         }
 
+        // 如果存在已核销的, 则不能退款
+        int cnt = iTaVerifyTargetService.getCountBy(taOrder.getOrderId(), null, 1);
+        if (cnt > 0) {
+            return ResponseBean.error("当前存在已核销内容, 不能退款", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         // 计算返现总额
         Integer totalCashback = orderSubList.stream().mapToInt(TaOrderSub::getCashback).reduce(Integer::sum).getAsInt();
 
         TaPerson person = getCurrentPerson();
-        iTaOrderService.refundOrder(taOrder, taPerson);
-        iTaOrderPayService.refundOrder(person, taOrder, totalCashback);
+        iTaOrderService.refundOrder(taOrder, taPerson, totalCashback);
 
         return ResponseBean.success("success");
     }

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

@@ -11,6 +11,7 @@ import com.yunzhi.shigongli.entity.TaOrder;
 import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.service.ITaOrderPayService;
 import com.yunzhi.shigongli.service.ITaOrderService;
+import com.yunzhi.shigongli.service.ITaVerifyTargetService;
 import com.yunzhi.shigongli.vo.MineOrder;
 import com.yunzhi.shigongli.vo.MineOrderSummary;
 import io.swagger.annotations.Api;
@@ -50,6 +51,9 @@ public class TaOrderSubController extends BaseController {
     @Autowired
     public ITaOrderPayService iTaOrderPayService;
 
+    @Autowired
+    public ITaVerifyTargetService iTaVerifyTargetService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -128,31 +132,39 @@ public class TaOrderSubController extends BaseController {
             return ResponseBean.error("您无权操作当前订单项目", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
+        // 如果存在已核销的, 则不能退款
+        int cnt = iTaVerifyTargetService.getCountBy(taOrderSub.getOrderId(), taOrderSub.getSubOrderId(), 1);
+        if (cnt > 0) {
+            return ResponseBean.error("当前存在已核销内容, 不能退款", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         iTaOrderPayService.refundOrderSub(taPerson, taOrder, taOrderSub);
         iTaOrderSubService.refund(taPerson, taOrder, taOrderSub);
+        // 删除所有待核销内容
+        iTaVerifyTargetService.removeBy(taOrderSub.getOrderId(), taOrderSub.getSubOrderId());
 
         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("核销成功");
-    }
+//    @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("核销成功");
+//    }
 
 //    /**
 //     * 保存对象
@@ -202,15 +214,19 @@ public class TaOrderSubController extends BaseController {
 //        }
 //    }
 
-//    /**
-//     * 根据id查询对象
-//     * @param id  实体ID
-//     */
-//    @RequestMapping(value="/taOrderSub/{id}",method= RequestMethod.GET)
-//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean taOrderSubGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        return ResponseBean.success(iTaOrderSubService.getById(id));
-//    }
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/wx/orderSub/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taOrderSubGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+
+        TaPerson taPerson = getCurrentPerson();
+        MineOrder result =  iTaOrderSubService.getSingleOrderSubOf(taPerson, id);
+
+        return ResponseBean.success(result);
+    }
 
     @GetMapping("/wx/orderSub")
     @ApiOperation(value="订单列表", notes = "订单列表", httpMethod = "GET", response = MineOrder.class)

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

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.*;
 import com.yunzhi.shigongli.entity.TaHotel;
 import com.yunzhi.shigongli.entity.TaRoom;
+import com.yunzhi.shigongli.entity.TaRoomOrderPerson;
 import com.yunzhi.shigongli.service.ITaHotelService;
+import com.yunzhi.shigongli.service.ITaRoomOrderPersonService;
 import com.yunzhi.shigongli.service.ITaRoomService;
 import com.yunzhi.shigongli.vo.AMapWeather;
 import io.swagger.annotations.Api;
@@ -21,6 +23,7 @@ import com.yunzhi.shigongli.service.ITaRoomOrderService;
 import com.yunzhi.shigongli.entity.TaRoomOrder;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -41,6 +44,9 @@ public class TaRoomOrderController extends BaseController {
     @Autowired
     public ITaRoomOrderService iTaRoomOrderService;
 
+    @Autowired
+    public ITaRoomOrderPersonService roomOrderPersonService;
+
     @Autowired
     public ITaRoomService iTaRoomService;
 
@@ -62,17 +68,30 @@ public class TaRoomOrderController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/taRoomOrder",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @RequestMapping(value="/wx/roomOrder",method= RequestMethod.GET)
+    @ApiOperation(value="房源订单列表", notes = "房源订单列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taRoomOrderList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TaRoomOrder> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaRoomOrder> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+                                        @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                        @ApiParam("房源ID") @RequestParam("roomId") String roomId ) throws Exception{
+
+        IPage<TaRoomOrder> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaRoomOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("room_id", roomId);
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaRoomOrder> result = iTaRoomOrderService.page(pg, queryWrapper);
+
+        // 遍历房源入住人
+        List<TaRoomOrder> list = result.getRecords();
+        if (null != list) {
+            for (TaRoomOrder roomOrder : list) {
+                List<TaRoomOrderPerson> personList = roomOrderPersonService.getListByRoomOrder(roomOrder.getRoomOrderId());
+                roomOrder.setPersonList(personList);
+            }
+        }
 
-            IPage<TaRoomOrder> result = iTaRoomOrderService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -153,7 +172,7 @@ public class TaRoomOrderController extends BaseController {
      */
     @RequestMapping(value="/wx/roomOrder/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taRoomOrderGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taRoomOrderGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaRoomOrderService.getById(id));
     }
 

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

@@ -56,25 +56,6 @@ public class TaRoomOrderPersonController extends BaseController {
     public ITaRoomService iTaRoomService;
 
 
-//    /**
-//     * 分页查询列表
-//     * @param pageNum
-//     * @param pageSize
-//     * @return
-//     */
-//    @RequestMapping(value="/wx/taRoomOrderPerson",method= RequestMethod.GET)
-//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean taRoomOrderPersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-//
-//		    IPage<TaRoomOrderPerson> pg = new Page<>(pageNum, pageSize);
-//            QueryWrapper<TaRoomOrderPerson> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.orderByDesc("create_date");
-//
-//            IPage<TaRoomOrderPerson> result = iTaRoomOrderPersonService.page(pg, queryWrapper);
-//            return ResponseBean.success(result);
-//    }
-
     /**
      * 保存对象
      * @param roomOrderPersonList 实体对象
@@ -94,7 +75,7 @@ public class TaRoomOrderPersonController extends BaseController {
             return ResponseBean.error("未找到有效的房源信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
-        TaRoom taRoom = iTaRoomService.getById(id);
+        TaRoom taRoom = iTaRoomService.getById(taRoomOrder.getRoomId());
         if (taRoom == null || !Constants.STATUS_NORMAL.equals(taRoom.getStatus())) {
             return ResponseBean.error("未找到有效的房源信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }

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

@@ -3,10 +3,10 @@ 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.ResponseBean;
-import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.common.*;
 import com.yunzhi.shigongli.entity.TaHotelAccount;
+import com.yunzhi.shigongli.service.ITaOrderSubService;
+import com.yunzhi.shigongli.service.ITaShopAccountLogService;
 import com.yunzhi.shigongli.vo.CommissionSettlementVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,6 +18,10 @@ import org.springframework.web.bind.annotation.*;
 import com.yunzhi.shigongli.service.ITaShopAccountService;
 import com.yunzhi.shigongli.entity.TaShopAccount;
 
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
     * 民宿账户 前端控制器
@@ -37,6 +41,12 @@ public class TaShopAccountController extends BaseController {
     @Autowired
     public ITaShopAccountService iTaShopAccountService;
 
+    @Autowired
+    public ITaOrderSubService iTaOrderSubService;
+
+    @Autowired
+    public ITaShopAccountLogService iTaShopAccountLogService;
+
     /**
      * 佣金结算
      * @param commissionSettlementVO
@@ -72,6 +82,48 @@ public class TaShopAccountController extends BaseController {
         }
     }
 
+    @GetMapping("/wx/shop/{id}/account")
+    @ApiOperation(value="商铺账户", notes = "商铺账户", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getAccountInfo(@ApiParam("对象ID") @PathVariable String id,
+                                       @ApiParam("收入类型") @RequestParam("amountType") String amountType) throws Exception {
+
+        Map<String, Object> result = new HashMap<>();
+        TaShopAccount taShopAccount = iTaShopAccountService.getByShop(id);
+        if (null == taShopAccount) {
+            return ResponseBean.error("未找到有效的结算民宿对象", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        result.put("acc", taShopAccount);
+
+        LocalDateTime now = LocalDateTime.now();
+        if (Constants.ACCOUNT_ORDER.equals(amountType)) {
+            // 获取全部订单金额
+            LocalDateTime start = DateUtils.from("2000-01-01 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            LocalDateTime end = now;
+            Integer totalCharges = iTaOrderSubService.getTotalCharges(Constants.TARGET_SHOP, id, start, end);
+            result.put("totalCharges", totalCharges);
+            // 本月订单金额
+            String month = DateUtils.toString(end, "yyyy-MM");
+            start = DateUtils.from(month + "-01 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            Integer currentCharges = iTaOrderSubService.getTotalCharges(Constants.TARGET_SHOP, id, start, end);
+            result.put("currentCharges", currentCharges);
+        }
+
+        if (Constants.ACCOUNT_COMMISSION.equals(amountType)) {
+            // 获取全部佣金金额
+            LocalDateTime start = DateUtils.from("2000-01-01 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            LocalDateTime end = now;
+            Integer totalCharges = iTaShopAccountLogService.getTotalCharges(taShopAccount.getAccountId(), Constants.ACCOUNT_COMMISSION, start, end);
+            result.put("totalCharges", totalCharges);
+            // 本月订单金额
+            String month = DateUtils.toString(end, "yyyy-MM");
+            start = DateUtils.from(month + "-01 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            Integer currentCharges = iTaShopAccountLogService.getTotalCharges(taShopAccount.getAccountId(), Constants.ACCOUNT_COMMISSION, start, end);
+            result.put("currentCharges", currentCharges);
+        }
+
+        return ResponseBean.success(result);
+    }
+
 //
 //
 //    /**

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

@@ -4,7 +4,10 @@ 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.TaHotelAccountLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -39,81 +42,30 @@ public class TaShopAccountLogController extends BaseController {
     @Autowired
     public ITaShopAccountLogService iTaShopAccountLogService;
 
-//
-//    /**
-//     * 分页查询列表
-//     * @param pageNum
-//     * @param pageSize
-//     * @return
-//     */
-//    @RequestMapping(value="/taShopAccountLog",method= RequestMethod.GET)
-//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean taShopAccountLogList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-//
-//		    IPage<TaShopAccountLog> pg = new Page<>(pageNum, pageSize);
-//            QueryWrapper<TaShopAccountLog> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.orderByDesc("create_date");
-//
-//            IPage<TaShopAccountLog> result = iTaShopAccountLogService.page(pg, queryWrapper);
-//            return ResponseBean.success(result);
-//    }
-//
-//    /**
-//     * 保存对象
-//     * @param taShopAccountLog 实体对象
-//     * @return
-//     */
-//    @RequestMapping(value="/taShopAccountLog",method= RequestMethod.POST)
-//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-//    public ResponseBean taShopAccountLogAdd(@ApiParam("保存内容") @RequestBody TaShopAccountLog taShopAccountLog) throws Exception{
-//
-//        if (iTaShopAccountLogService.save(taShopAccountLog)){
-//            return ResponseBean.success(taShopAccountLog);
-//        }else {
-//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-//
-//    /**
-//     * 根据id删除对象
-//     * @param id  实体ID
-//     */
-//    @RequestMapping(value="/taShopAccountLog/{id}", method= RequestMethod.DELETE)
-//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-//    public ResponseBean taShopAccountLogDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        if(iTaShopAccountLogService.removeLogicById(id)){
-//            return ResponseBean.success("success");
-//        }else {
-//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-//
-//    /**
-//     * 修改对象
-//     * @param id  实体ID
-//     * @param taShopAccountLog 实体对象
-//     * @return
-//     */
-//    @RequestMapping(value="/taShopAccountLog/{id}",method= RequestMethod.PUT)
-//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-//    public ResponseBean taShopAccountLogUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-//                                        @ApiParam("更新内容") @RequestBody TaShopAccountLog taShopAccountLog) throws Exception{
-//
-//        if (iTaShopAccountLogService.updateById(taShopAccountLog)){
-//            return ResponseBean.success(iTaShopAccountLogService.getById(id));
-//        }else {
-//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-//
-//    /**
-//     * 根据id查询对象
-//     * @param id  实体ID
-//     */
-//    @RequestMapping(value="/taShopAccountLog/{id}",method= RequestMethod.GET)
-//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean taShopAccountLogGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        return ResponseBean.success(iTaShopAccountLogService.getById(id));
-//    }
+    /**
+     * 获取账户流水
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @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,
+                                              @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{
+
+        if (StringUtils.isEmpty(amountType)) {
+            amountType = Constants.ACCOUNT_COMMISSION;
+        }
+
+        IPage<TaShopAccountLog> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaShopAccountLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("account_id", id);
+        queryWrapper.eq("amount_type", amountType);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaShopAccountLog> result = iTaShopAccountLogService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
 }

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

@@ -5,6 +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 io.swagger.annotations.Api;
@@ -14,9 +15,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * <p>
@@ -57,6 +63,15 @@ public class TaShopController extends BaseController {
     @Autowired
     public ITaLikeService iTaLikeService;
 
+    @Autowired
+    public ITaShopAccountService iTaShopAccountService;
+
+    @Autowired
+    public ITaMiniappQrcodeService iTaMiniappQrcodeService;
+
+    @Value("${sysBiz.miniapp.shopPage}")
+    public String shopPage;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -193,7 +208,7 @@ public class TaShopController extends BaseController {
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taShopGet(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         TaShop taShop = iTaShopService.getById(id);
-        if (Constants.STATUS_DELETED.equals(taShop.getStatus())) {
+        if (null == taShop || Constants.STATUS_DELETED.equals(taShop.getStatus())) {
             return ResponseBean.error("当前商铺信息不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
@@ -207,6 +222,27 @@ public class TaShopController extends BaseController {
         return ResponseBean.success(taShop);
     }
 
+    @PostMapping("/admin/taShop/{id}/qrcode")
+    @ApiOperation(value="店铺二维码", notes = "店铺二维码", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean generateQrCode(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        TaShop taShop = iTaShopService.getById(id);
+        if (null == taShop || Constants.STATUS_DELETED.equals(taShop.getStatus())) {
+            return ResponseBean.error("当前商铺信息不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        QrCodeParamsVO qrCodeParamsVO = new QrCodeParamsVO();
+        qrCodeParamsVO.setPage(shopPage);
+        qrCodeParamsVO.setType(Constants.TARGET_SHOP);
+        qrCodeParamsVO.setScene(new HashMap<String, Object>(){{
+            put("id", id);
+        }});
+        String qrCode = iTaMiniappQrcodeService.createQrCode(qrCodeParamsVO);
+
+        return ResponseBean.success(new HashMap<String, Object>(){{
+            put("qrCode", qrCode);
+        }});
+    }
+
     /**
      * 微信端详情
      * @param id
@@ -245,4 +281,61 @@ public class TaShopController extends BaseController {
         return ResponseBean.success(taShop);
     }
 
+    /**
+     * 商铺小程序首页
+     */
+    @RequestMapping(value="/wx/shop/manage/index",method= RequestMethod.GET)
+    @ApiOperation(value="商铺小程序首页", notes = "商铺小程序首页", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getWxManageIndex() throws Exception{
+        TaPerson taPerson = getCurrentPerson();
+        if (!Constants.TARGET_SHOP.equals(taPerson.getPersonRole())) {
+            return ResponseBean.error("请先进行人员身份绑定", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 获取所有的民宿信息
+        List<TaShop> shopList = iTaShopService.getListByPerson(taPerson);
+        if (null == shopList || shopList.size() < 1) {
+            return ResponseBean.error("数据异常, 未找到关联民宿", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("shopList", shopList);
+        result.put("shop", shopList.get(0));
+
+        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);
+//    }
+
 }

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

@@ -0,0 +1,166 @@
+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.*;
+import com.yunzhi.shigongli.service.*;
+import com.yunzhi.shigongli.vo.VerifyTargetVO;
+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;
+import java.util.List;
+
+/**
+ * <p>
+    * 核销内容表 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+
+@Api(tags = "核销内容表")
+@RestController
+@RequestMapping("/")
+public class TaVerifyTargetController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaVerifyTargetController.class);
+
+    @Autowired
+    public ITaVerifyTargetService iTaVerifyTargetService;
+
+    @Autowired
+    public ITaOrderSubService iTaOrderSubService;
+
+    @Autowired
+    public ITaOrderService iTaOrderService;
+
+    @Autowired
+    public ITaShopWorkerService shopWorkerService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/verifyTarget",method= RequestMethod.GET)
+    @ApiOperation(value="核销内容表", notes = "核销内容表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean tdTypeList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @ApiParam("商铺ID") @RequestParam(value ="shopId", required = false) String shopId,
+                                   @ApiParam("客户手机") @RequestParam(value ="phone", required = false) String phone,
+                                   @ApiParam("是否本人") @RequestParam(value ="isMine", required = false) Boolean isMine,
+                                   @ApiParam("是否核销") @RequestParam(value ="isVerified", required = false) Integer isVerified) throws Exception{
+
+        String personId = getCurrentPerson().getPersonId();
+        if (!StringUtils.isEmpty(shopId)) {
+            // 如果商铺不为空, 那么检索商铺的核销订单
+            personId = null;
+        }
+
+        if (null != isMine && isMine) {
+            personId = getCurrentPerson().getPersonId();
+        }
+
+        IPage<VerifyTargetVO> pg = new Page<>(pageNum, pageSize);
+        IPage<VerifyTargetVO> result = iTaVerifyTargetService.getWxPagedBy(pg, personId, shopId, phone, isVerified);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 核销
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    @PutMapping("/wx/verifyTarget/{id}")
+    @ApiOperation(value="订单项目核销", notes = "订单项目核销", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean valdiation(@ApiParam(value = "核销码") @PathVariable String id) throws Exception {
+        TaVerifyTarget taVerifyTarget = iTaVerifyTargetService.getById(id);
+        if (null == taVerifyTarget || Constants.STATUS_DELETED.equals(taVerifyTarget.getStatus())) {
+            return ResponseBean.error("未找到待核销内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaPerson taPerson = getCurrentPerson();
+        TaOrder taOrder = iTaOrderService.getById(taVerifyTarget.getOrderId());
+        TaOrderSub taOrderSub = iTaOrderSubService.getById(taVerifyTarget.getSubOrderId());
+
+        // 是否属于当前用户
+        String personId = getCurrentPerson().getPersonId();
+        if (!personId.equals(taVerifyTarget.getPersonId())) {
+            return ResponseBean.error("您无权核销当前内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        LocalDateTime expireDate = taVerifyTarget.getExpireDate();
+        if (null != expireDate && expireDate.isBefore(LocalDateTime.now())) {
+            return ResponseBean.error("当前项目已过期", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 核销
+        iTaVerifyTargetService.verify(taVerifyTarget);
+
+        // 是否当前子订单下所有都已经核销完成
+        int cnt = iTaVerifyTargetService.getCountBy(taVerifyTarget.getOrderId(), taVerifyTarget.getSubOrderId(), 0);
+        if (cnt == 0) {
+            iTaOrderSubService.validation(taPerson, taOrder, taOrderSub);
+        }
+
+        return ResponseBean.success("核销成功");
+    }
+
+    /**
+     * 核销确认
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    @PutMapping("/wx/verifyTarget/{id}/confirm")
+    @ApiOperation(value="核销确认", notes = "核销确认", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean valdiateConfirm(@ApiParam(value = "核销码") @PathVariable String id) throws Exception {
+        TaVerifyTarget taVerifyTarget = iTaVerifyTargetService.getById(id);
+        if (null == taVerifyTarget || Constants.STATUS_DELETED.equals(taVerifyTarget.getStatus())) {
+            return ResponseBean.error("未找到待核销内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (null != taVerifyTarget.getIsConfirmVerified() && taVerifyTarget.getIsConfirmVerified()) {
+            return ResponseBean.error("请勿重复确认核销", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaPerson taPerson = getCurrentPerson();
+        TaOrder taOrder = iTaOrderService.getById(taVerifyTarget.getOrderId());
+        TaOrderSub taOrderSub = iTaOrderSubService.getById(taVerifyTarget.getSubOrderId());
+
+        // 是否属于当前用户
+        List<TaShopWorker> workerList = shopWorkerService.getByPerson(taPerson.getPersonId());
+        if (null == workerList || workerList.size() < 1) {
+            return ResponseBean.error("您无权操作", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        boolean isOwner = false;
+        for (TaShopWorker worker : workerList) {
+            isOwner = isOwner || worker.getShopId().equals(taOrderSub.getShopId());
+        }
+        if (!isOwner) {
+            return ResponseBean.error("您无权操作", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 确认核销
+        taVerifyTarget.setIsConfirmVerified(true);
+        taVerifyTarget.setConfirmPerson(taPerson.getPersonId());
+        taVerifyTarget.setConfirmDate(LocalDateTime.now());
+        iTaVerifyTargetService.updateById(taVerifyTarget);
+
+        return ResponseBean.success("ok");
+    }
+}

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

@@ -0,0 +1,90 @@
+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.TdType;
+import com.yunzhi.shigongli.entity.TrPersonPage;
+import com.yunzhi.shigongli.service.ITdTypeService;
+import com.yunzhi.shigongli.service.ITrPersonPageService;
+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.Duration;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 用户访问埋点 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+
+@Api(tags = "用户访问埋点")
+@RestController
+@RequestMapping("/")
+public class TrPersonPageController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TrPersonPageController.class);
+
+    @Autowired
+    public ITrPersonPageService iTrPersonPageService;
+
+
+    /**
+     * 保存对象
+     * @param trPersonPage 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/track/page",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean tdTypeAdd(@ApiParam("保存内容") @RequestBody TrPersonPage trPersonPage) throws Exception{
+
+        LocalDateTime now = LocalDateTime.now();
+        trPersonPage.setPersonId(getCurrentPerson().getPersonId());
+        trPersonPage.setInDate(now);
+        trPersonPage.setOutDate(now);
+        trPersonPage.setDwellTime(0l);
+        trPersonPage.setCreateDate(now);
+
+        if (iTrPersonPageService.save(trPersonPage)){
+            return ResponseBean.success(trPersonPage);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @return
+     */
+    @RequestMapping(value="/wx/track/page/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean tdTypeUpdate(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        TrPersonPage trPersonPage = iTrPersonPageService.getById(id);
+
+        LocalDateTime now = LocalDateTime.now();
+        Duration duration = Duration.between(trPersonPage.getInDate(), now);
+        trPersonPage.setOutDate(LocalDateTime.now());
+        trPersonPage.setDwellTime(duration.toMillis() / 1000);
+
+        if (iTrPersonPageService.updateById(trPersonPage)){
+            return ResponseBean.success(trPersonPage);
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+}

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

@@ -39,5 +39,10 @@ public class TaFeedback implements Serializable {
     @ApiModelProperty(value = "时间")
     private LocalDateTime createDate;
 
+    @ApiModelProperty(value = "是否已读")
+    private Boolean isReaded;
+
+    @ApiModelProperty(value = "读取时间")
+    private LocalDateTime readDate;
 
 }

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

@@ -52,4 +52,9 @@ public class TaOrder implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
+    @ApiModelProperty(value = "退款原因")
+    private String refundReason;
+
+    @ApiModelProperty(value = "退款说明")
+    private String refundDecription;
 }

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

@@ -6,6 +6,8 @@ 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;
@@ -59,4 +61,8 @@ public class TaRoomOrder implements Serializable {
     @ApiModelProperty(value = "分享图")
     @TableField(exist = false)
     private String shareImage;
+
+    @ApiModelProperty(value = "房源入住人")
+    @TableField(exist = false)
+    private List<TaRoomOrderPerson> personList;
 }

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

@@ -0,0 +1,90 @@
+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="TaVerifyTarget对象", description="核销内容表")
+public class TaVerifyTarget implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "产品核销码")
+    @TableId(value = "verify_no", type = IdType.INPUT)
+    private String verifyNo;
+
+    @ApiModelProperty(value = "产品类型")
+    private String targetType;
+
+    @ApiModelProperty(value = "产品ID")
+    private String targetId;
+
+    @ApiModelProperty(value = "产品描述")
+    private String description;
+
+    @ApiModelProperty(value = "主图")
+    private String poster;
+
+    @ApiModelProperty(value = "价格/单位分")
+    private Integer actualPrice;
+
+    @ApiModelProperty(value = "原始价格/单位分")
+    private Integer standPrice;
+
+    @ApiModelProperty(value = "返现金额/单位分")
+    private Integer cashback;
+
+    @ApiModelProperty(value = "发放时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "过期时间")
+    private LocalDateTime expireDate;
+
+    @ApiModelProperty(value = "下单时间")
+    private LocalDateTime orderDate;
+
+    @ApiModelProperty(value = "下单ID")
+    private String orderId;
+
+    @ApiModelProperty(value = "子单号")
+    private String subOrderId;
+
+    @ApiModelProperty(value = "所属客户")
+    private String personId;
+
+    @ApiModelProperty(value = "是否核销")
+    private Boolean isVerified;
+
+    @ApiModelProperty(value = "核销时间")
+    private LocalDateTime verifiedDate;
+
+    @ApiModelProperty(value = "是否确认核销")
+    private Boolean isConfirmVerified;
+
+    @ApiModelProperty(value = "确认核销人")
+    private String confirmPerson;
+
+    @ApiModelProperty(value = "确认核销时间")
+    private LocalDateTime confirmDate;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+}

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

@@ -0,0 +1,57 @@
+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.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户访问埋点
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TrPersonPage对象", description="用户访问埋点")
+public class TrPersonPage {
+
+    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 = "地址位置")
+    private String location;
+
+    @ApiModelProperty(value = "页面地址")
+    private String page;
+
+    @ApiModelProperty(value = "页面参数")
+    private String params;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "进入时间")
+    private LocalDateTime inDate;
+
+    @ApiModelProperty(value = "离开时间")
+    private LocalDateTime outDate;
+
+    @ApiModelProperty(value = "驻留时间;单位秒")
+    private Long dwellTime;
+}

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

@@ -0,0 +1,44 @@
+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="TsStatisDaily对象", description="日统计")
+public class TsStatisDaily implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "序号")
+    @TableId(value = "statis_no", type = IdType.AUTO)
+    private String statisNo;
+
+    @ApiModelProperty(value = "日期;yyyy-MM-dd格式")
+    private String statisDate;
+
+    @ApiModelProperty(value = "统计内容")
+    private String statisType;
+
+    @ApiModelProperty(value = "数目")
+    private Integer num;
+
+
+}

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

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yunzhi.shigongli.vo.MineOrder;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -36,4 +38,12 @@ public interface TaOrderSubMapper extends BaseMapper<TaOrderSub> {
                                        @Param("isVerified") Integer isVerified);
 
     int getOrderNum(@Param("personId") String personId, @Param("status") Integer status);
+
+    Integer getTotalCharges(@Param("targetType") String targetType,
+                            @Param("targetId") String targetId,
+                            @Param("start") LocalDateTime start,
+                            @Param("end") LocalDateTime end);
+
+
+    MineOrder getSingleOrderSubOf(@Param("personId") String personId, @Param("targetType") String targetType, @Param("subOrderId") Integer subOrderId);
 }

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

@@ -1,8 +1,10 @@
 package com.yunzhi.shigongli.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaRoomOrderPerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>

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

@@ -3,6 +3,9 @@ package com.yunzhi.shigongli.mapper;
 import com.yunzhi.shigongli.entity.TaShopAccountLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -15,4 +18,8 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaShopAccountLogMapper extends BaseMapper<TaShopAccountLog> {
 
+    Integer getTotalCharges(@Param("accountId") String accountId,
+                            @Param("amountType") String amountType,
+                            @Param("start") LocalDateTime start,
+                            @Param("end") LocalDateTime end);
 }

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

@@ -7,6 +7,8 @@ import com.yunzhi.shigongli.vo.ShopListVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 商铺 Mapper 接口
@@ -26,4 +28,6 @@ public interface TaShopMapper extends BaseMapper<TaShop> {
                     @Param("evaluateType") String evaluateType,
                     @Param("targetType") String targetType,
                     @Param("targetId") String targetId);
+
+    List<TaShop> getListByPerson(@Param("personId") String personId);
 }

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

@@ -0,0 +1,30 @@
+package com.yunzhi.shigongli.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.entity.TaVerifyTarget;
+import com.yunzhi.shigongli.vo.VerifyTargetVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 核销内容表 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Mapper
+public interface TaVerifyTargetMapper extends BaseMapper<TaVerifyTarget> {
+
+    IPage<VerifyTargetVO> getWxPagedBy(IPage<VerifyTargetVO> pg,
+                                       @Param("personId") String personId,
+                                       @Param("shopId") String shopId,
+                                       @Param("phone") String phone,
+                                       @Param("isVerified") Integer isVerified);
+
+    int existsNo(@Param("verifyNo") String verifyNo);
+
+    int getCountBy(@Param("orderId") String orderId, @Param("subOrderId") String subOrderId, @Param("isVerified") Integer isVerified);
+}

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

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

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

@@ -0,0 +1,39 @@
+package com.yunzhi.shigongli.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.entity.TsStatisDaily;
+import com.yunzhi.shigongli.vo.StatisDailyVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 日统计 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Mapper
+public interface TsStatisDailyMapper extends BaseMapper<TsStatisDaily> {
+
+    List<StatisDailyVO> getListBy(@Param("startDate") String startDate, @Param("statisType") String statisType, @Param("days") long days);
+
+    @Select("SELECT sum( t.charges ) FROM ta_order_sub t  WHERE t.`status` = 1")
+    Integer statisOrderTotal();
+
+    @Select("SELECT count( 1 ) FROM ta_hotel t WHERE t.`status` > -1")
+    Integer countHotelTotal();
+
+    @Select("SELECT count( 1 ) FROM ta_room t WHERE t.`status` > -1")
+    Integer countRoomTotal();
+
+    @Select("SELECT count( 1 ) FROM ta_shop t WHERE t.`status` > -1")
+    Integer countShopTotal();
+
+    @Select("SELECT count( 1 ) FROM ta_person t WHERE t.`status` > -1")
+    Integer countPersonTotal();
+}

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

@@ -1,7 +1,5 @@
 package com.yunzhi.shigongli.service;
 
-import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
-import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 import com.yunzhi.shigongli.entity.TaOrder;
 
 import com.yunzhi.shigongli.entity.TaPerson;
@@ -21,5 +19,5 @@ public interface ITaOrderService extends IBaseService<TaOrder> {
 
     void cancelOrder(TaOrder taOrder, TaPerson taPerson) throws Exception;
 
-    void refundOrder(TaOrder taOrder, TaPerson taPerson) throws Exception;
+    void refundOrder(TaOrder taOrder, TaPerson taPerson, Integer totalCashback) throws Exception;
 }

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

@@ -8,6 +8,7 @@ import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.vo.MineOrder;
 import com.yunzhi.shigongli.vo.MineOrderSummary;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -29,4 +30,8 @@ public interface ITaOrderSubService extends IBaseService<TaOrderSub> {
     MineOrderSummary getOrderSummary(TaPerson taPerson);
 
     List<TaOrderSub> getListByOrder(TaOrder taOrder);
+
+    Integer getTotalCharges(String targetType, String targetId, LocalDateTime start, LocalDateTime end);
+
+    MineOrder getSingleOrderSubOf(TaPerson taPerson, Integer subOrderId);
 }

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

@@ -1,7 +1,10 @@
 package com.yunzhi.shigongli.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaRoomOrderPerson;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -12,5 +15,5 @@ import com.yunzhi.shigongli.entity.TaRoomOrderPerson;
  * @since 2021-08-17
  */
 public interface ITaRoomOrderPersonService extends IBaseService<TaRoomOrderPerson> {
-
+    List<TaRoomOrderPerson> getListByRoomOrder(String roomOrderId);
 }

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

@@ -2,6 +2,8 @@ package com.yunzhi.shigongli.service;
 
 import com.yunzhi.shigongli.entity.TaShopAccountLog;
 
+import java.time.LocalDateTime;
+
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.yunzhi.shigongli.entity.TaShopAccountLog;
  */
 public interface ITaShopAccountLogService extends IBaseService<TaShopAccountLog> {
 
+    Integer getTotalCharges(String accountId, String amountType, LocalDateTime start, LocalDateTime end);
 }

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

@@ -16,4 +16,6 @@ public interface ITaShopAccountService extends IBaseService<TaShopAccount> {
     TaShopAccount getByShop(String shopId);
 
     boolean commissionSettlement(TaShopAccount taShopAccount, Integer charges) throws Exception;
+
+    TaShopAccount getAccountInfoBy(String shopId);
 }

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

@@ -1,10 +1,13 @@
 package com.yunzhi.shigongli.service;
 
 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.ShopListVO;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -23,4 +26,6 @@ public interface ITaShopService extends IBaseService<TaShop> {
     boolean updatePVNum(String id);
 
     ResourceFieldVO copyProperties(TaShop taShop);
+
+    List<TaShop> getListByPerson(TaPerson taPerson);
 }

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

@@ -23,4 +23,6 @@ public interface ITaShopWorkerService extends IBaseService<TaShopWorker> {
     List<TaShopWorker> getByPhone(String phone);
 
     void updateByPerson(TaPerson taPerson) throws Exception;
+
+    List<TaShopWorker> getByPerson(String personId);
 }

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

@@ -0,0 +1,25 @@
+package com.yunzhi.shigongli.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.entity.TaVerifyTarget;
+import com.yunzhi.shigongli.vo.VerifyTargetVO;
+
+
+/**
+ * <p>
+ * 核销内容表 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+public interface ITaVerifyTargetService extends IBaseService<TaVerifyTarget> {
+
+    IPage<VerifyTargetVO> getWxPagedBy(IPage<VerifyTargetVO> pg, String personId, String shopId, String phone, Integer isVerified);
+
+    int getCountBy(String orderId, String subOrderId, Integer isVerified);
+
+    boolean removeBy(String orderId, String subOrderId);
+
+    void verify(TaVerifyTarget taVerifyTarget) throws Exception;
+}

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

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

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

@@ -0,0 +1,23 @@
+package com.yunzhi.shigongli.service;
+
+import com.yunzhi.shigongli.entity.TsStatisDaily;
+import com.yunzhi.shigongli.vo.StatisDailyVO;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 日统计 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+public interface ITsStatisDailyService extends IBaseService<TsStatisDaily> {
+
+    List<StatisDailyVO> getListBy(String startDate, String statisType, long days);
+
+    Map<String, Integer> statisSummary();
+}

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

@@ -17,8 +17,13 @@ import com.yunzhi.shigongli.service.ITaOrderPayService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 订单支付 服务实现类
@@ -51,6 +56,12 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
     @Autowired
     TaShopPackageMapper shopPackageMapper;
 
+    @Autowired
+    TaPersonMapper taPersonMapper;
+
+    @Autowired
+    TaVerifyTargetMapper taVerifyTargetMapper;
+
     /**
      * 支付回调
      * @param notifyResult
@@ -62,6 +73,10 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
         String orderId = orderPay.getOrderId();
         String orderSubId = orderPay.getSubOrderId();
 
+        TaOrder taOrder = taOrderMapper.selectById(orderId);
+        TaOrderSub taOrderSub = taOrderSubMapper.selectById(orderSubId);
+        TaPerson taPerson = taPersonMapper.selectById(orderPay.getPersonId());
+
         boolean isSuccess = WxPayConstants.ResultCode.SUCCESS.equals(notifyResult.getResultCode());
 
         orderPay.setPayDate(DateUtils.from(notifyResult.getTimeEnd(), "yyyyMMddHHmmss"));
@@ -70,8 +85,8 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
 
         orderPayMapper.updateById(orderPay);
 
-        // 更新订单为已支付
         if (isSuccess) {
+            // 更新订单为已支付
             if (!StringUtils.isEmpty(orderSubId)) {
                 taOrderSubMapper.updateStatus(orderSubId, Constants.ORDER_PAYED);
             } else {
@@ -79,11 +94,79 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
                 taOrderSubMapper.updateStatusByOrder(orderId, Constants.ORDER_PAYED);
             }
 
+            // 发送核销码
+            generateVerfiedRecords(taOrder, taOrderSub, taPerson);
+
             PaySuccessEvent evt = new PaySuccessEvent(this, orderPay);
             eventPublisher.publishEvent(evt);
         }
     }
 
+    /**
+     * 发放核销码
+     * @param taOrder
+     * @param taOrderSub
+     * @param taPerson
+     * @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);
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+
+        // 循环发放
+        for (TaOrderSub item : orderSubList) {
+            if (null == item) continue;
+
+            // 已经处理过的, 则不发放
+            int cnt = taVerifyTargetMapper.getCountBy(item.getOrderId(), item.getSubOrderId(), null);
+            if (cnt > 0) {
+                continue;
+            }
+
+            // 对应的套餐
+            TaShopPackage shopPackage = shopPackageMapper.selectById(item.getPackageId());
+            // 如果数量为2, 则生成2个
+            for (int i = 0; i < item.getAmount(); i += 1) {
+                TaVerifyTarget taVerifyTarget = new TaVerifyTarget();
+                taVerifyTarget.setVerifyNo(getVerifyNo());
+                taVerifyTarget.setTargetType(Constants.TARGET_SHOP_PACKAGE);
+                taVerifyTarget.setTargetId(item.getPackageId());
+                taVerifyTarget.setDescription(shopPackage.getDescription());
+                taVerifyTarget.setPoster(shopPackage.getPoster());
+                taVerifyTarget.setActualPrice(shopPackage.getActualPrice());
+                taVerifyTarget.setStandPrice(shopPackage.getStandardPrice());
+                taVerifyTarget.setCashback(shopPackage.getCashback());
+                taVerifyTarget.setCreateDate(now);
+                taVerifyTarget.setExpireDate(shopPackage.getEndTime());
+                taVerifyTarget.setOrderDate(item.getCreateDate());
+                taVerifyTarget.setOrderId(item.getOrderId());
+                taVerifyTarget.setSubOrderId(item.getSubOrderId());
+                taVerifyTarget.setPersonId(taPerson.getPersonId());
+                taVerifyTarget.setIsVerified(false);
+                taVerifyTarget.setIsConfirmVerified(false);
+                taVerifyTarget.setStatus(Constants.STATUS_NORMAL);
+
+                taVerifyTargetMapper.insert(taVerifyTarget);
+            }
+        }
+    }
+
+    private String getVerifyNo() {
+        while (true) {
+            String verifyNo = StringUtils.random(10);
+            int i = taVerifyTargetMapper.existsNo(verifyNo);
+            if (i <1 ) {
+                return verifyNo;
+            }
+        }
+    }
+
     @Override
     public void refundNotifyOrder(WxPayRefundNotifyResult result) throws Exception {
         WxPayRefundNotifyResult.ReqInfo reqInfo = result.getReqInfo();
@@ -164,7 +247,7 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
         // 找到主订单对应的那个支付记录
         TaOrderPay originOrderPay = orderPayMapper.getLastRowByOrder(taOrder.getOrderId());
         if (null != originOrderPay) {
-            if (Constants.PAY_SUCCESS.equals(originOrderPay.getStatus())) {
+            if (!Constants.PAY_SUCCESS.equals(originOrderPay.getStatus())) {
                 throw new Exception("未找到当前订单有效的支付记录");
             }
         } else {

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

@@ -1,15 +1,13 @@
 package com.yunzhi.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
-import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
-import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
-import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.yunzhi.shigongli.common.*;
 import com.yunzhi.shigongli.entity.*;
 import com.yunzhi.shigongli.mapper.*;
+import com.yunzhi.shigongli.service.ITaOrderPayService;
 import com.yunzhi.shigongli.service.ITaOrderService;
 
+import com.yunzhi.shigongli.service.ITaVerifyTargetService;
 import com.yunzhi.shigongli.vo.OrderItem;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +47,15 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
     @Autowired
     TaOrderPayMapper orderPayMapper;
 
+    @Autowired
+    TaPersonRecommenderMapper personRecommenderMapper;
+
+    @Autowired
+    public ITaOrderPayService iTaOrderPayService;
+
+    @Autowired
+    public ITaVerifyTargetService iTaVerifyTargetService;
+
     /**
      * 下单支付
      * @param person
@@ -121,11 +128,18 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void refundOrder(TaOrder taOrder, TaPerson taPerson) throws Exception {
+    public void refundOrder(TaOrder taOrder, TaPerson taPerson, Integer totalCashback) throws Exception {
+
+        taOrder.setStatus(Constants.ORDER_REFUND);
+        taOrderMapper.updateById(taOrder);
 
         // 只需要更新状态即可
-        taOrderMapper.updateStatus(taOrder.getOrderId(), Constants.ORDER_REFUND);
+//        taOrderMapper.updateStatus(taOrder.getOrderId(), Constants.ORDER_REFUND);
         taOrderSubMapper.updateStatusByOrder(taOrder.getOrderId(), Constants.ORDER_REFUND);
+
+        iTaOrderPayService.refundOrder(taPerson, taOrder, totalCashback);
+        // 删除所有待核销内容
+        iTaVerifyTargetService.removeBy(taOrder.getOrderId(), null);
     }
 
     /**
@@ -201,6 +215,9 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
             boolean isRecommend = Constants.RECOMMEND_SHOP.equals(taPerson.getFromType())
                     && shopPackage.getShopId().equals(taPerson.getRecommender());
 
+            // 当前人员是否有有效的推荐人
+            boolean hasRecommend = checkPersonRecommender(taPerson);
+
             orderSub.setShopId(shopPackage.getShopId());
             orderSub.setPackageId(packageId);
             String desc = StringUtils.ifNull(shopPackage.getDescription(), "套餐项目");
@@ -231,11 +248,11 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
                 Integer charges = orderSub.getCharges() - orderSub.getCashback();
 
                 // 引流分成
-                Integer trafficRate = packageSetting.getTrafficRate();
-                Integer trafficCommission = charges * (trafficRate / 1000);
+                Integer trafficRate = hasRecommend ? packageSetting.getTrafficRate() : 0;
+                Integer trafficCommission = (int) (charges * (trafficRate.floatValue() / 1000));
                 // 平台分成
                 Integer platformRate = packageSetting.getPlatformRate();
-                Integer platformCommission = charges * (platformRate / 1000);
+                Integer platformCommission = (int) (charges * (platformRate.floatValue() / 1000));
                 // 总提成
                 Integer commissionCharge = trafficCommission + platformCommission;
                 if (commissionCharge < 0 || commissionCharge >= charges) {
@@ -262,6 +279,11 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
         return totalCharge;
     }
 
+    private boolean checkPersonRecommender(TaPerson taPerson) {
+        TaPersonRecommender acitveRecommender = personRecommenderMapper.getAcitveRecommender(taPerson.getPersonId());
+        return null != acitveRecommender;
+    }
+
     /**
      * 获取人员最近的一笔订单
      * @param personId

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

@@ -135,6 +135,16 @@ public class TaOrderSubServiceImpl extends BaseServiceImpl<TaOrderSubMapper, TaO
         return taOrderSubMapper.getListByOrder(taOrder.getOrderId());
     }
 
+    @Override
+    public Integer getTotalCharges(String targetType, String targetId, LocalDateTime start, LocalDateTime end) {
+        return taOrderSubMapper.getTotalCharges(targetType, targetId, start, end);
+    }
+
+    @Override
+    public MineOrder getSingleOrderSubOf(TaPerson taPerson, Integer subOrderId) {
+        return baseMapper.getSingleOrderSubOf(taPerson.getPersonId(), Constants.TARGET_SHOP, subOrderId);
+    }
+
     /**
      * 商铺抽成入账户
      * @param shopId

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

@@ -1,11 +1,15 @@
 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.entity.TaRoomOrderPerson;
 import com.yunzhi.shigongli.mapper.TaRoomOrderPersonMapper;
 import com.yunzhi.shigongli.service.ITaRoomOrderPersonService;
 
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 房源订单打开人 服务实现类
@@ -17,4 +21,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaRoomOrderPersonServiceImpl extends BaseServiceImpl<TaRoomOrderPersonMapper, TaRoomOrderPerson> implements ITaRoomOrderPersonService {
 
+    @Override
+    public List<TaRoomOrderPerson> getListByRoomOrder(String roomOrderId) {
+        LambdaQueryWrapper<TaRoomOrderPerson> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaRoomOrderPerson::getRoomOrderId, roomOrderId);
+        queryWrapper.orderByAsc(TaRoomOrderPerson::getCreateDate);
+
+        return list(queryWrapper);
+    }
 }

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

@@ -6,6 +6,8 @@ import com.yunzhi.shigongli.service.ITaShopAccountLogService;
 
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 商户账户流水 服务实现类
@@ -17,4 +19,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaShopAccountLogServiceImpl extends BaseServiceImpl<TaShopAccountLogMapper, TaShopAccountLog> implements ITaShopAccountLogService {
 
+    @Override
+    public Integer getTotalCharges(String accountId, String amountType, LocalDateTime start, LocalDateTime end) {
+        return baseMapper.getTotalCharges(accountId, amountType, start, end);
+    }
 }

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

@@ -59,4 +59,9 @@ public class TaShopAccountServiceImpl extends BaseServiceImpl<TaShopAccountMappe
 
         return true;
     }
+
+    @Override
+    public TaShopAccount getAccountInfoBy(String shopId) {
+        return null;
+    }
 }

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

@@ -110,4 +110,9 @@ public class TaShopServiceImpl extends BaseServiceImpl<TaShopMapper, TaShop> imp
         }
         return  resourceVO;
     }
+
+    @Override
+    public List<TaShop> getListByPerson(TaPerson taPerson) {
+        return taShopMapper.getListByPerson(taPerson.getPersonId());
+    }
 }

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

@@ -46,4 +46,13 @@ public class TaShopWorkerServiceImpl extends BaseServiceImpl<TaShopWorkerMapper,
     public void updateByPerson(TaPerson taPerson) throws Exception {
         shopWorkerMapper.updateByPerson(taPerson);
     }
+
+    @Override
+    public List<TaShopWorker> getByPerson(String personId) {
+        LambdaQueryWrapper<TaShopWorker> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaShopWorker::getPersonId, personId);
+        queryWrapper.gt(TaShopWorker::getStatus, Constants.STATUS_DELETED);
+
+        return list(queryWrapper);
+    }
 }

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

@@ -0,0 +1,56 @@
+package com.yunzhi.shigongli.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.common.Constants;
+import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.entity.TaVerifyTarget;
+import com.yunzhi.shigongli.mapper.TaVerifyTargetMapper;
+import com.yunzhi.shigongli.service.ITaVerifyTargetService;
+import com.yunzhi.shigongli.vo.VerifyTargetVO;
+import org.springframework.jdbc.object.UpdatableSqlQuery;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 核销内容表 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Service
+public class TaVerifyTargetServiceImpl extends BaseServiceImpl<TaVerifyTargetMapper, TaVerifyTarget> implements ITaVerifyTargetService {
+
+    @Override
+    public IPage<VerifyTargetVO> getWxPagedBy(IPage<VerifyTargetVO> pg, String personId, String shopId, String phone, Integer isVerified) {
+        return baseMapper.getWxPagedBy(pg, personId, shopId, phone, isVerified);
+    }
+
+    @Override
+    public int getCountBy(String orderId, String subOrderId, Integer isVerified) {
+        return baseMapper.getCountBy(orderId, subOrderId, isVerified);
+    }
+
+    @Override
+    public boolean removeBy(String orderId, String subOrderId) {
+        UpdateWrapper<TaVerifyTarget> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("status", Constants.STATUS_DELETED);
+        updateWrapper.eq("order_id", orderId);
+        updateWrapper.eq(!StringUtils.isEmpty(subOrderId), "sub_order_id", subOrderId);
+
+        return update(updateWrapper);
+    }
+
+    @Override
+    public void verify(TaVerifyTarget taVerifyTarget) throws Exception {
+        taVerifyTarget.setIsVerified(true);
+        taVerifyTarget.setVerifiedDate(LocalDateTime.now());
+
+        if (!updateById(taVerifyTarget)) {
+            throw new Exception("核销失败, 请重试");
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.yunzhi.shigongli.service.impl;
+
+import com.yunzhi.shigongli.entity.TrPersonPage;
+import com.yunzhi.shigongli.mapper.TrPersonPageMapper;
+import com.yunzhi.shigongli.service.ITrPersonPageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户访问埋点 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Service
+public class TrPersonPageServiceImpl extends BaseServiceImpl<TrPersonPageMapper, TrPersonPage> implements ITrPersonPageService {
+
+}

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

@@ -0,0 +1,59 @@
+package com.yunzhi.shigongli.service.impl;
+
+import com.yunzhi.shigongli.entity.TaOrderSub;
+import com.yunzhi.shigongli.entity.TsStatisDaily;
+import com.yunzhi.shigongli.mapper.TaOrderSubMapper;
+import com.yunzhi.shigongli.mapper.TsStatisDailyMapper;
+import com.yunzhi.shigongli.service.ITsStatisDailyService;
+import com.yunzhi.shigongli.vo.StatisDailyVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 分类标签 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Service
+public class TsStatisDailyServiceImpl extends BaseServiceImpl<TsStatisDailyMapper, TsStatisDaily> implements ITsStatisDailyService {
+
+    @Autowired
+    TaOrderSubMapper orderSubMapper;
+
+    @Override
+    public List<StatisDailyVO> getListBy(String startDate, String statisType, long days) {
+
+        return baseMapper.getListBy(startDate, statisType, days);
+    }
+
+    @Override
+    public Map<String, Integer> statisSummary() {
+        // 总营业额
+        Integer totalCharge = baseMapper.statisOrderTotal();
+        // 民宿数量
+        Integer hotelNum = baseMapper.countHotelTotal();
+        // 房源数量
+        Integer roomNum = baseMapper.countRoomTotal();
+        // 商户数量
+        Integer shopNum = baseMapper.countShopTotal();
+        // 客户数量
+        Integer personNum = baseMapper.countPersonTotal();
+
+        Map<String, Integer> result = new HashMap<>();
+        result.put("totalCharge", totalCharge);
+        result.put("hotelNum", hotelNum);
+        result.put("roomNum", roomNum);
+        result.put("shopNum", shopNum);
+        result.put("personNum", personNum);
+
+        return result;
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.yunzhi.shigongli.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value="ResourceFieldVO", description="退款申请参数")
+@Data
+public class RefundParamsVO {
+
+    @ApiModelProperty(value = "退款原因")
+    private String refundReason;
+
+    @ApiModelProperty(value = "退款说明")
+    private String refundDecription;
+
+}

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

@@ -0,0 +1,19 @@
+package com.yunzhi.shigongli.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@ApiModel(description = "日活统计")
+@Data
+@Accessors(chain = true)
+public class StatisDailyVO {
+
+    @ApiModelProperty("日期")
+    private String date;
+
+    @ApiModelProperty("统计数")
+    private Integer num;
+}

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

@@ -0,0 +1,15 @@
+package com.yunzhi.shigongli.vo;
+
+import com.yunzhi.shigongli.entity.TaVerifyTarget;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel(description = "核销订单")
+@Data
+public class VerifyTargetVO extends TaVerifyTarget {
+
+    @ApiModelProperty("客户手机")
+    String phone;
+}

src/main/resources/application.yml

@@ -60,8 +60,8 @@ weixin:
     subAppId:
     subMchId:
     keyPath: /yunpan/shigongli/cert/apiclient_cert.p12
-    notifyUrl: https://sgl.njyunzhi.com/api/wxpay/notify/order
-    refundNotifyUrl: https://sgl.njyunzhi.com/api/wxpay/notify/refund
+    notifyUrl: https://sgl-v2.njyunzhi.com/api/wxpay/notify/order
+    refundNotifyUrl: https://sgl-v2.njyunzhi.com/api/wxpay/notify/refund
 
 ## 高德地图
 amap:
@@ -69,6 +69,11 @@ amap:
     api: https://restapi.amap.com/v3/weather/weatherInfo?key=3be0a9567a794d2690d378476f057a6f&city=%s&extensions=base&output=JSON
     backImage: https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/weather/background_%s.png
 
+sysBiz:
+  miniapp:
+      shopPage: pages/index/index
+#    shopPage: pages/details/foodDetails/foodDetails
+
 ###
 spring:
   application:

src/main/resources/mapper/TaOrderSubMapper.xml

@@ -83,4 +83,43 @@
           AND t.`status` = #{status}
           AND s.`status` > -1
     </select>
+    <select id="getTotalCharges" resultType="java.lang.Integer">
+        SELECT
+            sum( t.charges ) - sum( t.cashback )
+        FROM
+            ta_order_sub t
+        WHERE
+            t.shop_id = #{targetId}
+          AND t.create_date BETWEEN #{start} AND #{end}
+          AND t.`status` = 1
+    </select>
+    <select id="getSingleOrderSubOf" resultType="com.yunzhi.shigongli.vo.MineOrder">
+        SELECT
+            t.*,
+            ( m.sweet_score + m.environment_score + m.service_score ) / 3 AS score,
+            n.standard_price,
+            n.description AS package_description,
+            n.poster,
+            n.start_time,
+            n.end_time,
+            (
+                SELECT
+                    count( 1 )
+                FROM
+                    ta_evaluation a
+                WHERE
+                    a.target_type = #{targetType}
+                    AND a.target_id = t.shop_id
+                    AND a.person_id = s.person_id
+            ) AS is_evaluated
+        FROM
+            ta_order_sub t
+            INNER JOIN ta_order s ON s.order_id = t.order_id
+            INNER JOIN ta_shop m ON m.shop_id = t.shop_id
+            INNER JOIN ta_shop_package n ON n.package_id = t.package_id
+        WHERE
+            t.sub_order_id = #{subOrderId}
+            AND s.person_id = #{personId}
+            AND s.`status` &gt; - 1
+    </select>
 </mapper>

src/main/resources/mapper/TaShopAccountLogMapper.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.TaShopAccountLogMapper">
 
+    <select id="getTotalCharges" resultType="java.lang.Integer">
+        SELECT
+            sum( t.amount )
+        FROM
+            ta_shop_account_log t
+        WHERE
+            t.account_id = #{accountId}
+          AND t.amount_type = #{amountType}
+          AND t.create_date BETWEEN #{start} AND #{end}
+    </select>
 </mapper>

src/main/resources/mapper/TaShopMapper.xml

@@ -59,4 +59,15 @@
             t.weight DESC,
             t.create_date DESC
     </select>
+    <select id="getListByPerson" resultType="com.yunzhi.shigongli.entity.TaShop">
+        SELECT
+            t.*
+        FROM
+            ta_shop t
+        WHERE
+            EXISTS ( SELECT * FROM ta_shop_worker s WHERE s.shop_id = t.shop_id AND s.person_id = #{personId} AND s.`status` = 1 )
+          AND t.`status` = 1
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaVerifyTargetMapper.xml

@@ -0,0 +1,53 @@
+<?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.TaVerifyTargetMapper">
+
+    <select id="getWxPagedBy" resultType="com.yunzhi.shigongli.vo.VerifyTargetVO">
+        SELECT
+            t.*,
+            s.phone
+        FROM
+            ta_verify_target t
+                INNER JOIN ta_person s ON s.person_id = t.person_id
+                INNER JOIN ta_order_sub m ON m.package_id = t.target_id
+        WHERE
+            t.`status` &gt; - 1
+          <if test="personId != null and personId != ''">
+              AND s.person_id = #{personId}
+          </if>
+          <if test="shopId != null and shopId != ''">
+              AND m.shop_id = #{shopId}
+          </if>
+          <if test="phone != null and phone != ''">
+            AND s.phone = #{phone}
+          </if>
+          <if test="isVerified != null">
+            AND t.is_verified = #{isVerified}
+          </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
+    <select id="existsNo" resultType="java.lang.Integer">
+        SELECT
+            COUNT( 1 )
+        FROM
+            ta_verify_target t
+        WHERE
+            t.verify_no = #{verifyNo}
+    </select>
+    <select id="getCountBy" resultType="java.lang.Integer">
+        SELECT
+            COUNT( 1 )
+        FROM
+            ta_verify_target t
+        WHERE
+            t.order_id = #{orderId}
+        <if test="subOrderId != null and subOrderId != ''">
+            AND t.sub_order_id = #{subOrderId}
+        </if>
+        <if test="isVerified != null">
+            AND t.is_verified = #{isVerified}
+        </if>
+            AND t.`status` &gt; - 1
+    </select>
+</mapper>

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

src/main/resources/mapper/TsStatisDailyMapper.xml

@@ -0,0 +1,18 @@
+<?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.TsStatisDailyMapper">
+
+    <select id="getListBy" resultType="com.yunzhi.shigongli.vo.StatisDailyVO">
+        SELECT
+            fn_format_date_with_interval ( #{startDate}, t.rownum ) AS date,
+            IFNULL( s.num, 0 ) AS num
+        FROM
+            sequence t
+            LEFT JOIN ts_statis_daily s ON s.statis_date = fn_format_date_with_interval ( #{startDate}, t.rownum )
+            AND s.statis_type = #{statisType}
+        WHERE
+            t.rownum &lt; #{days}
+        ORDER BY
+            t.rownum ASC
+    </select>
+</mapper>