feats

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

@@ -14,7 +14,7 @@ public class Constants {
 
     // 支付结果
     public final static Integer PAY_SUCCESS = 1;
-    public final static Integer PAY_FAIL = 0;
+    public final static Integer PAY_FAIL = 2;
 
     // 抽成分类
     public final static String COMMISSION_TRAFFIC = "traffic";  // 引流抽成
@@ -34,10 +34,11 @@ public class Constants {
 
     // 系统模块
     public final static String TARGET_ORDER = "order";                  // 订单
+    public final static String TARGET_ORDER_SUB = "order_sub";          // 订单项目
     public final static String TARGET_HOTEL = "hotel";                  // 民宿
     public final static String TARGET_SHOP = "shop";                    // 商铺
     public final static String TARGET_SHOP_PACKAGE = "shop_package";    // 商铺套餐
-    public final static String TARGET_TOURIST = "tourist";                // 景点
+    public final static String TARGET_TOURIST = "tourist";              // 景点
 
     // 商品套餐类型
     public final static String PACKAGE_NORMAL = "normal";           // 普通套餐
@@ -47,6 +48,11 @@ public class Constants {
     public final static String RECOMMEND_SHOP = "shop";     // 商铺
     public final static String RECOMMEND_HOTEL = "hotel";   // 民宿
 
+    // 评价
+    public final static String EVALUATE_ENVIRONMENT = "environment";    // 环境评分
+    public final static String EVALUATE_SWEET = "sweet";                // 口味评分
+    public final static String EVALUATE_SERVICE = "service";            // 服务评分
+
     // 系统参数
     public final static String CONF_HOTEL_RECOMMEND_VALID_DAYS = "hotel_recommend_valid_days";      // 民宿推广客户有效时间
     public final static String CONF_SHOP_RECOMMEND_VALID_DAYS = "shop_recommend_valid_days";        // 商铺推广客户有效时间

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

@@ -8,6 +8,7 @@ import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.yunzhi.shigongli.config.WeixinConfig;
 import com.yunzhi.shigongli.entity.TaOrder;
+import com.yunzhi.shigongli.entity.TaOrderPay;
 import com.yunzhi.shigongli.entity.TaOrderSub;
 import com.yunzhi.shigongli.entity.TaPerson;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,18 +27,18 @@ public class WxPayUtils {
     /**
      * 下单
      * @param person
-     * @param taOrder
+     * @param orderPay
      * @return
      * @throws Exception
      */
-    public WxPayMpOrderResult createOrder(TaPerson person, TaOrder taOrder) throws Exception {
+    public WxPayMpOrderResult createOrder(TaPerson person, TaOrderPay orderPay) throws Exception {
         LocalDateTime now = LocalDateTime.now();
         WxPayService payService = wxUtils.getPayService();
 
         WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
-        orderRequest.setBody(taOrder.getDescription());
-        orderRequest.setOutTradeNo(taOrder.getOrderId());
-        orderRequest.setTotalFee(taOrder.getCharges());
+        orderRequest.setBody(orderPay.getDescription());
+        orderRequest.setOutTradeNo(orderPay.getPayId());
+        orderRequest.setTotalFee(orderPay.getCharges());
         orderRequest.setOpenid(person.getOpenid());
         orderRequest.setNotifyUrl(config.getPay().getNotifyUrl());
         orderRequest.setSpbillCreateIp("218.91.253.51");  // 随便写个 IP
@@ -49,44 +50,44 @@ public class WxPayUtils {
         return payResult;
     }
 
-    /**
-     * 订单退款
-     * @param taOrder
-     * @param cashback
-     * @return
-     * @throws Exception
-     */
-    public WxPayRefundResult refund(TaOrder taOrder, Integer cashback) throws Exception {
-        WxPayService payService = wxUtils.getPayService();
-        WxPayRefundRequest refundRequest = new WxPayRefundRequest();
-        refundRequest.setOutTradeNo(taOrder.getOrderId());
-        refundRequest.setOutRefundNo("R"+taOrder.getOrderId());
-        refundRequest.setTotalFee(taOrder.getCharges());
-        refundRequest.setRefundFee(taOrder.getCharges() - cashback);
-        refundRequest.setNotifyUrl(config.getPay().getRefundNotifyUrl());
-        WxPayRefundResult result = payService.refund(refundRequest);
-
-        if (!WxPayConstants.ResultCode.SUCCESS.equals(result.getResultCode())) {
-            throw new Exception(result.getErrCodeDes());
-        }
-
-        return result;
-    }
+//    /**
+//     * 订单退款
+//     * @param taOrder
+//     * @param cashback
+//     * @return
+//     * @throws Exception
+//     */
+//    public WxPayRefundResult refund(TaOrder taOrder, Integer cashback) throws Exception {
+//        WxPayService payService = wxUtils.getPayService();
+//        WxPayRefundRequest refundRequest = new WxPayRefundRequest();
+//        refundRequest.setOutTradeNo(taOrder.getOrderId());
+//        refundRequest.setOutRefundNo("R"+taOrder.getOrderId());
+//        refundRequest.setTotalFee(taOrder.getCharges());
+//        refundRequest.setRefundFee(taOrder.getCharges() - cashback);
+//        refundRequest.setNotifyUrl(config.getPay().getRefundNotifyUrl());
+//        WxPayRefundResult result = payService.refund(refundRequest);
+//
+//        if (!WxPayConstants.ResultCode.SUCCESS.equals(result.getResultCode())) {
+//            throw new Exception(result.getErrCodeDes());
+//        }
+//
+//        return result;
+//    }
 
     /**
-     * 订单项目退款
-     * @param taOrder
-     * @param taOrderSub
+     * 订单退款
+     * @param originOrderPay
+     * @param orderPay
      * @return
      * @throws Exception
      */
-    public WxPayRefundResult refund(TaOrder taOrder, TaOrderSub taOrderSub) throws Exception {
+    public WxPayRefundResult refund(TaOrderPay originOrderPay, TaOrderPay orderPay) throws Exception {
         WxPayService payService = wxUtils.getPayService();
         WxPayRefundRequest refundRequest = new WxPayRefundRequest();
-        refundRequest.setOutTradeNo(taOrderSub.getOrderId());
-        refundRequest.setOutRefundNo("R"+taOrderSub.getSubOrderId());
-        refundRequest.setTotalFee(taOrder.getCharges());
-        refundRequest.setRefundFee(taOrderSub.getCharges() - taOrderSub.getCashback());
+        refundRequest.setOutTradeNo(originOrderPay.getPayId());
+        refundRequest.setOutRefundNo(orderPay.getPayId());
+        refundRequest.setTotalFee(originOrderPay.getCharges());
+        refundRequest.setRefundFee(orderPay.getCharges());
         refundRequest.setNotifyUrl(config.getPay().getRefundNotifyUrl());
         WxPayRefundResult result = payService.refund(refundRequest);
 

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

@@ -5,6 +5,8 @@ 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.entity.TaPerson;
+import com.yunzhi.shigongli.vo.EvaluateTarget;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -42,38 +44,38 @@ public class TaEvaluationController extends BaseController {
 
     /**
      * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/admin/taEvaluation",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taEvaluationList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TaEvaluation> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaEvaluation> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaEvaluation> result = iTaEvaluationService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
-
-    /**
-     * 保存对象
-     * @param taEvaluation 实体对象
-     * @return
-     */
-    @RequestMapping(value="/wx/taEvaluation",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taEvaluationAdd(@ApiParam("保存内容") @RequestBody TaEvaluation taEvaluation) throws Exception{
-
-        if (iTaEvaluationService.save(taEvaluation)){
-            return ResponseBean.success(taEvaluation);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/admin/taEvaluation",method= RequestMethod.GET)
+//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taEvaluationList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+//
+//		    IPage<TaEvaluation> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaEvaluation> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.orderByDesc("create_date");
+//
+//            IPage<TaEvaluation> result = iTaEvaluationService.page(pg, queryWrapper);
+//            return ResponseBean.success(result);
+//    }
+//
+//    /**
+//     * 保存对象
+//     * @param taEvaluation 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/wx/taEvaluation",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean taEvaluationAdd(@ApiParam("保存内容") @RequestBody TaEvaluation taEvaluation) throws Exception{
+//
+//        if (iTaEvaluationService.save(taEvaluation)){
+//            return ResponseBean.success(taEvaluation);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
 //
 //    /**
 //     * 根据id删除对象
@@ -108,12 +110,21 @@ public class TaEvaluationController extends BaseController {
 //    }
 
     /**
-     * 根据id查询对象
+     * 用户评分
      * @param id  实体ID
      */
-    @RequestMapping(value="/wx/taEvaluation/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taEvaluationGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaEvaluationService.getById(id));
+    @RequestMapping(value="/wx/{targetType}/{targetId}/evaluate",method= RequestMethod.POST)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taEvaluationGet(@ApiParam("对象类型") @PathVariable String targetType,
+                                        @ApiParam("对象ID") @PathVariable String targetId,
+                                        @ApiParam("评价内容") @RequestBody EvaluateTarget evaluateTarget) throws Exception{
+        TaPerson taPerson = getCurrentPerson();
+
+        evaluateTarget.setTargetType(targetType);
+        evaluateTarget.setTargetId(targetId);
+
+        iTaEvaluationService.evaluateSomething(taPerson, evaluateTarget);
+
+        return ResponseBean.success("ok");
     }
 }

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

@@ -5,6 +5,8 @@ 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.entity.TaSave;
+import com.yunzhi.shigongli.service.ITaResourceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +22,8 @@ import com.yunzhi.shigongli.service.ITaLikeService;
 import com.yunzhi.shigongli.entity.TaLike;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
     * 点赞表 前端控制器
@@ -39,6 +43,8 @@ public class TaLikeController extends BaseController {
     @Autowired
     public ITaLikeService iTaLikeService;
 
+    @Autowired
+    public ITaResourceService iTaResourceService;
 
     /**
      * 分页查询列表
@@ -64,11 +70,18 @@ public class TaLikeController extends BaseController {
      * @param taLike 实体对象
      * @return
      */
-    @RequestMapping(value="/wx/taLike",method= RequestMethod.POST)
+    @RequestMapping(value="/wx/{targetType}/like/{targetId}",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taLikeAdd(@ApiParam("保存内容") @RequestBody TaLike taLike) throws Exception{
+    public ResponseBean taLikeAdd(@ApiParam("对象类型") @PathVariable String targetType,
+                                  @ApiParam("对象ID") @PathVariable String targetId) throws Exception{
 
+        TaLike taLike = new TaLike();
+        taLike.setTargetType(targetType);
+        taLike.setTargetId(targetId);
+        taLike.setPersonId(getCurrentPerson().getPersonId());
+        taLike.setCreateDate(LocalDateTime.now());
         if (iTaLikeService.save(taLike)){
+            iTaResourceService.updateLike(taLike, 1);
             return ResponseBean.success(taLike);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -79,10 +92,14 @@ public class TaLikeController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/wx/taLike/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/wx/{targetType}/like/{targetId}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taLikeDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaLikeService.removeLogicById(id)){
+    public ResponseBean taLikeDelete(@ApiParam("对象类型") @PathVariable String targetType,
+                                     @ApiParam("对象ID") @PathVariable String targetId) throws Exception{
+        TaLike taLike = iTaLikeService.getByTarget(targetType, targetId, getCurrentPerson().getPersonId());
+
+        if(iTaLikeService.removeById(taLike.getLikeId())){
+            iTaResourceService.updateLike(taLike, -1);
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -5,8 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.entity.TaOrderSub;
 import com.yunzhi.shigongli.entity.TaPerson;
+import com.yunzhi.shigongli.service.ITaOrderPayService;
+import com.yunzhi.shigongli.service.ITaOrderSubService;
 import com.yunzhi.shigongli.vo.OrderItem;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,6 +28,7 @@ import com.yunzhi.shigongli.entity.TaOrder;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * <p>
@@ -44,6 +49,12 @@ public class TaOrderController extends BaseController {
     @Autowired
     public ITaOrderService iTaOrderService;
 
+    @Autowired
+    public ITaOrderSubService iTaOrderSubService;
+
+    @Autowired
+    public ITaOrderPayService iTaOrderPayService;
+
 
 //    /**
 //     * 分页查询列表
@@ -80,7 +91,33 @@ public class TaOrderController extends BaseController {
         }
 
         TaPerson person = getCurrentPerson();
-        WxPayMpOrderResult result = iTaOrderService.order(person, orderItems);
+        TaOrder taOrder = iTaOrderService.order(person, orderItems);
+        WxPayMpOrderResult result = iTaOrderPayService.prePay(person, taOrder);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 小程序发起支付
+     * @param id
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/wx/order/{id}/pay",method= RequestMethod.POST)
+    @ApiOperation(value="发起支付", notes = "发起支付", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taOrderPay(@ApiParam("订单号") @PathVariable String id,
+                                   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 (!Constants.ORDER_READY.equals(taOrder.getStatus())) {
+            return ResponseBean.error("订单非未支付状态, 不能完成操作", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaPerson person = getCurrentPerson();
+        WxPayMpOrderResult result = iTaOrderPayService.prePay(person, taOrder);
         return ResponseBean.success(result);
     }
 
@@ -91,12 +128,12 @@ public class TaOrderController extends BaseController {
      * @return
      * @throws Exception
      */
-    @RequestMapping(value="/wx/order/{id}",method= RequestMethod.POST)
-    @ApiOperation(value="生成订单", notes = "生成订单", httpMethod = "POST", response = ResponseBean.class)
+    @RequestMapping(value="/wx/order/{id}",method= RequestMethod.DELETE)
+    @ApiOperation(value="取消订单", notes = "取消订单", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean taOrderDelete(@ApiParam("订单ID") @PathVariable String id,
                                    HttpServletRequest request) throws Exception{
         TaOrder taOrder = iTaOrderService.getById(id);
-        if (null == taOrder) {
+        if (null == taOrder || Constants.STATUS_DELETED.equals(taOrder.getStatus())) {
             return ResponseBean.error("订单不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
@@ -109,6 +146,52 @@ public class TaOrderController extends BaseController {
         return ResponseBean.success("取消成功");
     }
 
+    /**
+     * 订单退款
+     * @param id
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/wx/order/{id}/refund",method= RequestMethod.DELETE)
+    @ApiOperation(value="订单退款", notes = "订单退款", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taOrderPayCancel(@ApiParam("订单号") @PathVariable String id,
+                                   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 (!Constants.ORDER_PAYED.equals(taOrder.getStatus())) {
+            return ResponseBean.error("订单非未支付状态, 不能完成操作", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaPerson taPerson = getCurrentPerson();
+        if (!taPerson.getPersonId().equals(taOrder.getPersonId())) {
+            return ResponseBean.error("您无权取消当前订单", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        List<TaOrderSub> orderSubList = iTaOrderSubService.getListByOrder(taOrder);
+        if (null == orderSubList || orderSubList.size() < 1) {
+            throw new Exception("未找到订单详情");
+        }
+
+        // 只有全部为已支付的可以取消
+        Object[] o1 = orderSubList.stream().filter(x -> !Constants.ORDER_PAYED.equals(x.getStatus()) || x.getIsVerified()).toArray();
+        if (o1.length > 0) {
+            throw new Exception("订单存在非支付状态项目, 不能退款");
+        }
+
+        // 计算返现总额
+        Integer totalCashback = orderSubList.stream().mapToInt(TaOrderSub::getCashback).reduce(Integer::sum).getAsInt();
+
+        TaPerson person = getCurrentPerson();
+        iTaOrderService.refundOrder(taOrder, taPerson);
+        iTaOrderPayService.refundOrder(person, taOrder, totalCashback);
+
+        return ResponseBean.success("success");
+    }
+
 //    /**
 //     * 根据id删除对象
 //     * @param id  实体ID

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

@@ -3,12 +3,16 @@ 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.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.entity.TaOrder;
 import com.yunzhi.shigongli.entity.TaPerson;
+import com.yunzhi.shigongli.service.ITaOrderPayService;
 import com.yunzhi.shigongli.service.ITaOrderService;
+import com.yunzhi.shigongli.vo.MineOrder;
+import com.yunzhi.shigongli.vo.MineOrderSummary;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -19,6 +23,8 @@ import org.springframework.web.bind.annotation.*;
 import com.yunzhi.shigongli.service.ITaOrderSubService;
 import com.yunzhi.shigongli.entity.TaOrderSub;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 子订单表 前端控制器
@@ -41,6 +47,9 @@ public class TaOrderSubController extends BaseController {
     @Autowired
     public ITaOrderService iTaOrderService;
 
+    @Autowired
+    public ITaOrderPayService iTaOrderPayService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -60,6 +69,36 @@ public class TaOrderSubController extends BaseController {
             return ResponseBean.success(result);
     }
 
+    /**
+     * 订单项目发起支付
+     * @param id
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/wx/orderSub/{id}/pay",method= RequestMethod.POST)
+    @ApiOperation(value="订单项目发起支付", notes = "订单项目发起支付", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taOrderPay(@ApiParam("订单项目ID") @PathVariable String id,
+                                   HttpServletRequest request) throws Exception{
+        TaOrderSub taOrderSub = iTaOrderSubService.getById(id);
+        if (null == taOrderSub || Constants.STATUS_DELETED.equals(taOrderSub.getStatus())) {
+            return ResponseBean.error("未找到订单信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaOrder taOrder = iTaOrderService.getById(taOrderSub.getSubOrderId());
+        if (null == taOrder || Constants.STATUS_DELETED.equals(taOrder.getStatus())) {
+            return ResponseBean.error("未找到订单信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (!Constants.ORDER_READY.equals(taOrderSub.getStatus())) {
+            return ResponseBean.error("订单非未支付状态, 不能完成操作", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaPerson person = getCurrentPerson();
+        WxPayMpOrderResult result = iTaOrderPayService.prePay(person, taOrder, taOrderSub);
+        return ResponseBean.success(result);
+    }
+
     /**
      * 订单项目退款
      * @param id
@@ -89,6 +128,7 @@ public class TaOrderSubController extends BaseController {
             return ResponseBean.error("您无权操作当前订单项目", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
+        iTaOrderPayService.refundOrderSub(taPerson, taOrder, taOrderSub);
         iTaOrderSubService.refund(taPerson, taOrder, taOrderSub);
 
         return ResponseBean.success("操作完成");
@@ -173,10 +213,25 @@ public class TaOrderSubController extends BaseController {
 //    }
 
     @GetMapping("/wx/orderSub")
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = TaOrderSub.class)
+    @ApiOperation(value="订单列表", notes = "订单列表", httpMethod = "GET", response = MineOrder.class)
     public ResponseBean getWxMyOrders(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                       @ApiParam("状态") @RequestParam(value ="status", required = false) Integer status) {
-        return ResponseBean.success(null);
+        TaPerson taPerson = getCurrentPerson();
+
+        IPage<MineOrder> pg = new Page<>(pageNum, pageSize);
+        IPage<MineOrder> result = iTaOrderSubService.getOrderSubListOf(pg, taPerson, status);
+
+        return ResponseBean.success(result);
+    }
+
+    @GetMapping("/wx/orderSub/summary/mine")
+    @ApiOperation(value="我的订单概况", notes = "我的订单概况", httpMethod = "GET", response = MineOrder.class)
+    public ResponseBean getWxMyOrders() {
+        TaPerson taPerson = getCurrentPerson();
+
+        MineOrderSummary result = iTaOrderSubService.getOrderSummary(taPerson);
+
+        return ResponseBean.success(result);
     }
 }

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

@@ -51,6 +51,12 @@ public class TaShopController extends BaseController {
     public ITaResourceService taResourceService;
 
 
+    @Autowired
+    public ITaSaveService iTaSaveService;
+
+    @Autowired
+    public ITaLikeService iTaLikeService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -221,6 +227,14 @@ public class TaShopController extends BaseController {
         taShop.setLikeNum(taResource.getLikeNum());
         taShop.setImageList(shopImagesService.getListBy(Constants.TARGET_SHOP, id));
 
+        // 是否收藏
+        TaSave taSave = iTaSaveService.getByTarget(Constants.TARGET_SHOP, id, getCurrentPerson().getPersonId());
+        taShop.setIsSaved(null == taSave ? 0 : 1);
+
+        // 是否点赞
+        TaLike taLike = iTaLikeService.getByTarget(Constants.TARGET_SHOP, id, getCurrentPerson().getPersonId());
+        taShop.setIsLike(null == taLike ? 0 : 1);
+
         // 统计 PV, UV
         try {
             taResourceService.recordPerson(Constants.TARGET_SHOP, id, getCurrentPerson());

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.BaseController;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.entity.TaLike;
 import com.yunzhi.shigongli.entity.TaResource;
 import com.yunzhi.shigongli.entity.TaSave;
 import com.yunzhi.shigongli.service.*;
@@ -56,6 +57,9 @@ public class TaTouristController extends BaseController {
     @Autowired
     public ITaSaveService iTaSaveService;
 
+    @Autowired
+    public ITaLikeService iTaLikeService;
+
 
     /**
      * 分页查询列表
@@ -169,7 +173,7 @@ public class TaTouristController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/tourist/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/wx/tourist/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getWxDetail(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         TaTourist taTourist = iTaTouristService.getById(id);
@@ -188,6 +192,10 @@ public class TaTouristController extends BaseController {
         TaSave taSave = iTaSaveService.getByTarget(Constants.TARGET_TOURIST, id, getCurrentPerson().getPersonId());
         taTourist.setIsSaved(null == taSave ? 0 : 1);
 
+        // 是否点赞
+        TaLike taLike = iTaLikeService.getByTarget(Constants.TARGET_TOURIST, id, getCurrentPerson().getPersonId());
+        taTourist.setIsLike(null == taLike ? 0 : 1);
+
         try {
             taResourceService.recordPerson(Constants.TARGET_TOURIST, id, getCurrentPerson());
         } catch (Exception e) {

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

@@ -79,6 +79,9 @@ public class WxMaController extends BaseController {
         rtn.put("sessionKey", info.getSessionKey());
 
         TaPerson taPerson = iTaPersonService.getById(params.getPersonId());
+        if (null == taPerson) {
+            taPerson = iTaPersonService.getByOpenid(info.getOpenid());
+        }
         rtn.put("person", taPerson);
 
         // 查询人员角色

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

@@ -3,6 +3,8 @@ package com.yunzhi.shigongli.entity;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -28,7 +30,7 @@ public class TaOrderPay implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "支付ID")
-    @TableId(value = "pay_id", type = IdType.UUID)
+    @TableId(value = "pay_id", type = IdType.INPUT)
     private String payId;
 
     @ApiModelProperty(value = "订单ID")
@@ -52,6 +54,9 @@ public class TaOrderPay implements Serializable {
     @ApiModelProperty(value = "支付金额;单位分")
     private Integer charges;
 
+    @ApiModelProperty(value = "商品描述")
+    private String description;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 
@@ -60,6 +65,4 @@ public class TaOrderPay implements Serializable {
 
     @ApiModelProperty(value = "支付时间")
     private LocalDateTime payDate;
-
-
 }

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

@@ -40,6 +40,9 @@ public class TaOrderSub implements Serializable {
     @ApiModelProperty(value = "套餐ID")
     private String packageId;
 
+    @ApiModelProperty(value = "子订单描述")
+    private String description;
+
     @ApiModelProperty(value = "总金额;单位分")
     private Integer charges;
 

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

@@ -0,0 +1,37 @@
+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="TaSequence对象", description="序列号")
+public class TaSequence implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "seq_name", type = IdType.INPUT)
+    @ApiModelProperty(value = "序列号名称")
+    private String seqName;
+
+    @ApiModelProperty(value = "序列号")
+    private Integer val;
+
+}

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

@@ -104,4 +104,12 @@ public class TaShop implements Serializable {
     @TableField(exist = false)
     private List<TaTargetType> typeList;
 
+
+    @ApiModelProperty(value = "是否收藏")
+    @TableField(exist = false)
+    private Integer isSaved;
+
+    @ApiModelProperty(value = "是否点赞")
+    @TableField(exist = false)
+    private Integer isLike;
 }

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

@@ -104,4 +104,8 @@ public class TaTourist implements Serializable {
     @ApiModelProperty(value = "是否收藏")
     @TableField(exist = false)
     private Integer isSaved;
+
+    @ApiModelProperty(value = "是否点赞")
+    @TableField(exist = false)
+    private Integer isLike;
 }

src/main/java/com/yunzhi/shigongli/event/PaySuccessEvent.java

@@ -1,6 +1,6 @@
 package com.yunzhi.shigongli.event;
 
-import com.yunzhi.shigongli.entity.TaOrder;
+import com.yunzhi.shigongli.entity.TaOrderPay;
 import org.springframework.context.ApplicationEvent;
 
 /**
@@ -8,14 +8,14 @@ import org.springframework.context.ApplicationEvent;
  */
 public class PaySuccessEvent extends ApplicationEvent {
 
-    TaOrder taOrder;
+    TaOrderPay taOrderPay;
 
-    public PaySuccessEvent(Object source, TaOrder taOrder) {
+    public PaySuccessEvent(Object source, TaOrderPay taOrderPay) {
         super(source);
-        this.taOrder = taOrder;
+        this.taOrderPay = taOrderPay;
     }
 
-    public TaOrder getTaOrder() {
-        return taOrder;
+    public TaOrderPay getTaOrderPay() {
+        return taOrderPay;
     }
 }

src/main/java/com/yunzhi/shigongli/event/RefundSuccessEvent.java

@@ -1,6 +1,7 @@
 package com.yunzhi.shigongli.event;
 
 import com.yunzhi.shigongli.entity.TaOrder;
+import com.yunzhi.shigongli.entity.TaOrderPay;
 import com.yunzhi.shigongli.entity.TaOrderSub;
 import org.springframework.context.ApplicationEvent;
 
@@ -9,21 +10,14 @@ import org.springframework.context.ApplicationEvent;
  */
 public class RefundSuccessEvent extends ApplicationEvent {
 
-    TaOrder taOrder;
+    TaOrderPay taOrderPay;
 
-    TaOrderSub taOrderSub;
-
-    public RefundSuccessEvent(Object source, TaOrder taOrder, TaOrderSub taOrderSub) {
+    public RefundSuccessEvent(Object source, TaOrderPay taOrderPay) {
         super(source);
-        this.taOrder = taOrder;
-        this.taOrderSub = taOrderSub;
-    }
-
-    public TaOrder getTaOrder() {
-        return taOrder;
+        this.taOrderPay = taOrderPay;
     }
 
-    public TaOrderSub getTaOrderSub() {
-        return taOrderSub;
+    public TaOrderPay getTaOrderPay() {
+        return taOrderPay;
     }
 }

src/main/java/com/yunzhi/shigongli/event/listener/PaySuccessEventListener.java

@@ -16,7 +16,7 @@ public class PaySuccessEventListener implements ApplicationListener<PaySuccessEv
         try {
 
             // 支付成功之后, 给个人返现
-            personAccountService.cashback(evt.getTaOrder());
+            personAccountService.cashback(evt.getTaOrderPay());
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/com/yunzhi/shigongli/event/listener/RefundSuccessEventListener.java

@@ -1,6 +1,7 @@
 package com.yunzhi.shigongli.event.listener;
 
 import com.yunzhi.shigongli.entity.TaOrder;
+import com.yunzhi.shigongli.entity.TaOrderPay;
 import com.yunzhi.shigongli.entity.TaOrderSub;
 import com.yunzhi.shigongli.event.RefundSuccessEvent;
 import com.yunzhi.shigongli.service.ITaPersonAccountService;
@@ -15,8 +16,7 @@ public class RefundSuccessEventListener  implements ApplicationListener<RefundSu
 
     @Override
     public void onApplicationEvent(RefundSuccessEvent evt) {
-        TaOrder taOrder = evt.getTaOrder();
-        TaOrderSub taOrderSub = evt.getTaOrderSub();
+        TaOrderPay taOrderPay = evt.getTaOrderPay();
 
         // 暂时不需要处理什么
     }

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

@@ -17,4 +17,6 @@ import org.apache.ibatis.annotations.Param;
 public interface TaOrderMapper extends BaseMapper<TaOrder> {
 
     int updateStatus(@Param("orderId") String orderId, @Param("status") Integer status);
+
+    int getOrderNum(@Param("personId") String personId, @Param("status") Integer status);
 }

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

@@ -17,4 +17,8 @@ import org.apache.ibatis.annotations.Param;
 public interface TaOrderPayMapper extends BaseMapper<TaOrderPay> {
 
     TaOrderPay getByOrder(@Param("orderId") String orderId, @Param("subOrderId") String subOrderId);
+
+    TaOrderPay getLastRowByOrder(@Param("orderId") String orderId);
+
+    TaOrderPay getLastRowByOrderSub(@Param("orderId") String orderId, @Param("subOrderId") String subOrderId);
 }

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

@@ -1,7 +1,9 @@
 package com.yunzhi.shigongli.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaOrderSub;
 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;
 
@@ -25,4 +27,11 @@ public interface TaOrderSubMapper extends BaseMapper<TaOrderSub> {
     int updateStatus(@Param("subOrderId") String subOrderId, @Param("status") Integer status);
 
     int updateVerified(@Param("subOrderId") String subOrderId, @Param("isVerified") int isVerified);
+
+    IPage<MineOrder> getOrderSubListOf(IPage<MineOrder> pg,
+                                       @Param("personId") String personId,
+                                       @Param("shopTarget") String shopTarget,
+                                       @Param("status") Integer status);
+
+    int getOrderNum(@Param("personId") String personId, @Param("status") Integer status);
 }

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

@@ -0,0 +1,22 @@
+package com.yunzhi.shigongli.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.entity.TaSequence;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 访问人 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Mapper
+public interface TaSequenceMapper extends BaseMapper<TaSequence> {
+
+    @Select("select fn_nextval(#{seqName})")
+    int nextval(@Param("seqName") String seqName);
+}

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

@@ -21,4 +21,9 @@ public interface TaShopMapper extends BaseMapper<TaShop> {
     IPage<ShopListVO> getPageListBy(IPage<ShopListVO> pg, @Param("shopName") String shopName, @Param("phone") String phone);
 
     int updatePVNum(@Param("phone") String id);
+
+    int updateScore(@Param("field") String field,
+                    @Param("evaluateType") String evaluateType,
+                    @Param("targetType") String targetType,
+                    @Param("targetId") String targetId);
 }

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

@@ -1,6 +1,8 @@
 package com.yunzhi.shigongli.service;
 
 import com.yunzhi.shigongli.entity.TaEvaluation;
+import com.yunzhi.shigongli.entity.TaPerson;
+import com.yunzhi.shigongli.vo.EvaluateTarget;
 
 
 /**
@@ -13,4 +15,5 @@ import com.yunzhi.shigongli.entity.TaEvaluation;
  */
 public interface ITaEvaluationService extends IBaseService<TaEvaluation> {
 
+    void evaluateSomething(TaPerson taPerson, EvaluateTarget evaluateTarget) throws Exception;
 }

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

@@ -13,4 +13,5 @@ import com.yunzhi.shigongli.entity.TaLike;
  */
 public interface ITaLikeService extends IBaseService<TaLike> {
 
+    TaLike getByTarget(String targetType, String targetId, String personId);
 }

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

@@ -2,7 +2,11 @@ package com.yunzhi.shigongli.service;
 
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
+import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
+import com.yunzhi.shigongli.entity.TaOrder;
 import com.yunzhi.shigongli.entity.TaOrderPay;
+import com.yunzhi.shigongli.entity.TaOrderSub;
+import com.yunzhi.shigongli.entity.TaPerson;
 
 
 /**
@@ -18,4 +22,12 @@ public interface ITaOrderPayService extends IBaseService<TaOrderPay> {
     void notifyOrder(WxPayOrderNotifyResult notifyResult) throws Exception;
 
     void refundNotifyOrder(WxPayRefundNotifyResult result) throws Exception;
+
+    WxPayMpOrderResult prePay(TaPerson person, TaOrder taOrder) throws Exception;
+
+    void refundOrderSub(TaPerson taPerson, TaOrder taOrder, TaOrderSub taOrderSub) throws Exception;
+
+    void refundOrder(TaPerson person, TaOrder taOrder, Integer totalCashback) throws Exception;
+
+    WxPayMpOrderResult prePay(TaPerson person, TaOrder taOrder, TaOrderSub taOrderSub) throws Exception;
 }

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

@@ -17,7 +17,9 @@ import com.yunzhi.shigongli.vo.OrderItem;
  */
 public interface ITaOrderService extends IBaseService<TaOrder> {
 
-    WxPayMpOrderResult order(TaPerson person, OrderItem[] orderItems) throws Exception;
+    TaOrder order(TaPerson person, OrderItem[] orderItems) throws Exception;
 
     void cancelOrder(TaOrder taOrder, TaPerson taPerson) throws Exception;
+
+    void refundOrder(TaOrder taOrder, TaPerson taPerson) throws Exception;
 }

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

@@ -1,9 +1,14 @@
 package com.yunzhi.shigongli.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaOrder;
 import com.yunzhi.shigongli.entity.TaOrderSub;
 
 import com.yunzhi.shigongli.entity.TaPerson;
+import com.yunzhi.shigongli.vo.MineOrder;
+import com.yunzhi.shigongli.vo.MineOrderSummary;
+
+import java.util.List;
 
 /**
  * <p>
@@ -18,4 +23,10 @@ public interface ITaOrderSubService extends IBaseService<TaOrderSub> {
     void refund(TaPerson person, TaOrder taOrder, TaOrderSub taOrderSub) throws Exception;
 
     void validation(TaPerson taPerson, TaOrder taOrder, TaOrderSub taOrderSub) throws Exception;
+
+    IPage<MineOrder> getOrderSubListOf(IPage<MineOrder> pg, TaPerson taPerson, Integer status);
+
+    MineOrderSummary getOrderSummary(TaPerson taPerson);
+
+    List<TaOrderSub> getListByOrder(TaOrder taOrder);
 }

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

@@ -1,6 +1,7 @@
 package com.yunzhi.shigongli.service;
 
 import com.yunzhi.shigongli.entity.TaOrder;
+import com.yunzhi.shigongli.entity.TaOrderPay;
 import com.yunzhi.shigongli.entity.TaOrderSub;
 import com.yunzhi.shigongli.entity.TaPersonAccount;
 
@@ -15,6 +16,6 @@ import com.yunzhi.shigongli.entity.TaPersonAccount;
  */
 public interface ITaPersonAccountService extends IBaseService<TaPersonAccount> {
 
-    void cashback(TaOrder taOrder) throws Exception;
+    void cashback(TaOrderPay orderPay) throws Exception;
 
 }

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

@@ -1,6 +1,7 @@
 package com.yunzhi.shigongli.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.entity.TaLike;
 import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.entity.TaResource;
 import com.yunzhi.shigongli.entity.TaSave;
@@ -26,4 +27,6 @@ public interface ITaResourceService extends IBaseService<TaResource> {
     void updateSave(TaSave taSave, int num);
 
     IPage<ResourceListVO> getWxPagedBy(IPage<ResourceListVO> pg, TaPerson taPerso, String location, String typeId);
+
+    void updateLike(TaLike taLike, int num);
 }

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

@@ -1,10 +1,19 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.entity.TaEvaluation;
+import com.yunzhi.shigongli.entity.TaPerson;
+import com.yunzhi.shigongli.entity.TaShop;
 import com.yunzhi.shigongli.mapper.TaEvaluationMapper;
+import com.yunzhi.shigongli.mapper.TaShopMapper;
 import com.yunzhi.shigongli.service.ITaEvaluationService;
 
+import com.yunzhi.shigongli.vo.EvaluateTarget;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,4 +26,88 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaEvaluationServiceImpl extends BaseServiceImpl<TaEvaluationMapper, TaEvaluation> implements ITaEvaluationService {
 
+    @Autowired
+    TaShopMapper taShopMapper;
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void evaluateSomething(TaPerson taPerson, EvaluateTarget evaluateTarget) throws Exception {
+        if (null == evaluateTarget.getEnvironmentScore()
+                && null == evaluateTarget.getSweetScore()
+                && null == evaluateTarget.getServiceScore()) {
+            throw new Exception("未找到评价内容");
+        }
+
+        if (evaluateTarget.getEnvironmentScore() < 1
+                && evaluateTarget.getSweetScore() < 1
+                && evaluateTarget.getServiceScore() < 1) {
+            throw new Exception("未找到评价内容");
+        }
+
+        // 环境评分
+        if (evaluateTarget.getEnvironmentScore() > 0) {
+            TaEvaluation taEvaluation = new TaEvaluation();
+            taEvaluation.setEvaluateType(Constants.EVALUATE_ENVIRONMENT);
+            taEvaluation.setTargetType(evaluateTarget.getTargetType());
+            taEvaluation.setTargetId(evaluateTarget.getTargetId());
+            taEvaluation.setScore(evaluateTarget.getEnvironmentScore());
+            taEvaluation.setPersonId(taPerson.getPersonId());
+            taEvaluation.setCreateDate(LocalDateTime.now());
+            baseMapper.insert(taEvaluation);
+
+            // 暂时不将用户评分纳入系统
+//            if (Constants.TARGET_SHOP.equals(evaluateTarget.getTargetType())) {
+//                //
+//                taShopMapper.updateScore("environment_score",
+//                        taEvaluation.getEvaluateType(),
+//                        taEvaluation.getTargetType(),
+//                        taEvaluation.getTargetId());
+//            }
+        }
+
+        // 口味评分
+        if (evaluateTarget.getSweetScore() > 0) {
+            TaEvaluation taEvaluation = new TaEvaluation();
+            taEvaluation.setEvaluateType(Constants.EVALUATE_SWEET);
+            taEvaluation.setTargetType(evaluateTarget.getTargetType());
+            taEvaluation.setTargetId(evaluateTarget.getTargetId());
+            taEvaluation.setScore(evaluateTarget.getSweetScore());
+            taEvaluation.setPersonId(taPerson.getPersonId());
+            taEvaluation.setCreateDate(LocalDateTime.now());
+            baseMapper.insert(taEvaluation);
+
+            // 暂时不将用户评分纳入系统
+//            if (Constants.TARGET_SHOP.equals(evaluateTarget.getTargetType())) {
+//                //
+//                taShopMapper.updateScore("sweet_score",
+//                        taEvaluation.getEvaluateType(),
+//                        taEvaluation.getTargetType(),
+//                        taEvaluation.getTargetId());
+//            }
+        }
+
+        // 服务评分
+        if (evaluateTarget.getServiceScore() > 0) {
+            TaEvaluation taEvaluation = new TaEvaluation();
+            taEvaluation.setEvaluateType(Constants.EVALUATE_SERVICE);
+            taEvaluation.setTargetType(evaluateTarget.getTargetType());
+            taEvaluation.setTargetId(evaluateTarget.getTargetId());
+            taEvaluation.setScore(evaluateTarget.getServiceScore());
+            taEvaluation.setPersonId(taPerson.getPersonId());
+            taEvaluation.setCreateDate(LocalDateTime.now());
+            baseMapper.insert(taEvaluation);
+
+            // 暂时不将用户评分纳入系统
+//            if (Constants.TARGET_SHOP.equals(evaluateTarget.getTargetType())) {
+//                //
+//                taShopMapper.updateScore("service_score",
+//                        taEvaluation.getEvaluateType(),
+//                        taEvaluation.getTargetType(),
+//                        taEvaluation.getTargetId());
+//            }
+        }
+
+    }
+
+
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yunzhi.shigongli.entity.TaLike;
 import com.yunzhi.shigongli.mapper.TaLikeMapper;
 import com.yunzhi.shigongli.service.ITaLikeService;
@@ -17,4 +18,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaLikeServiceImpl extends BaseServiceImpl<TaLikeMapper, TaLike> implements ITaLikeService {
 
+    @Override
+    public TaLike getByTarget(String targetType, String targetId, String personId) {
+        LambdaQueryWrapper<TaLike> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaLike::getTargetType, targetType);
+        queryWrapper.eq(TaLike::getTargetId, targetId);
+        queryWrapper.eq(TaLike::getPersonId, personId);
+
+        return getOne(queryWrapper);
+    }
 }

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

@@ -2,21 +2,22 @@ package com.yunzhi.shigongli.service.impl;
 
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
+import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.DateUtils;
-import com.yunzhi.shigongli.entity.TaOrder;
-import com.yunzhi.shigongli.entity.TaOrderPay;
+import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.common.WxPayUtils;
+import com.yunzhi.shigongli.entity.*;
 import com.yunzhi.shigongli.event.PaySuccessEvent;
 import com.yunzhi.shigongli.event.RefundSuccessEvent;
-import com.yunzhi.shigongli.mapper.TaOrderMapper;
-import com.yunzhi.shigongli.mapper.TaOrderPayMapper;
-import com.yunzhi.shigongli.mapper.TaOrderSubMapper;
+import com.yunzhi.shigongli.mapper.*;
 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.Transactional;
 
 /**
  * <p>
@@ -29,6 +30,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaOrderPay> implements ITaOrderPayService {
 
+    @Autowired
+    WxPayUtils wxPayUtils;
+
     @Autowired
     TaOrderPayMapper orderPayMapper;
 
@@ -41,6 +45,12 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
     @Autowired
     ApplicationEventPublisher eventPublisher;
 
+    @Autowired
+    TaSequenceMapper taSequenceMapper;
+
+    @Autowired
+    TaShopPackageMapper shopPackageMapper;
+
     /**
      * 支付回调
      * @param notifyResult
@@ -48,34 +58,28 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
      */
     @Override
     public void notifyOrder(WxPayOrderNotifyResult notifyResult) throws Exception {
-        TaOrder taOrder = taOrderMapper.selectById(notifyResult.getOutTradeNo());
+        TaOrderPay orderPay = getById(notifyResult.getOutTradeNo());
+        String orderId = orderPay.getOrderId();
+        String orderSubId = orderPay.getSubOrderId();
+
         boolean isSuccess = WxPayConstants.ResultCode.SUCCESS.equals(notifyResult.getResultCode());
 
-        TaOrderPay orderPay = new TaOrderPay();
-        orderPay.setOrderId(taOrder.getOrderId());
-        orderPay.setPersonId(taOrder.getPersonId());
-        orderPay.setCharges(notifyResult.getTotalFee());
         orderPay.setPayDate(DateUtils.from(notifyResult.getTimeEnd(), "yyyyMMddHHmmss"));
         orderPay.setStatus(isSuccess ? Constants.PAY_SUCCESS : Constants.PAY_FAIL);
         orderPay.setMessage(isSuccess ? null : notifyResult.getErrCodeDes());
 
-        TaOrderPay origin = orderPayMapper.getByOrder(taOrder.getOrderId(), null);
-        if (null != origin) {
-            orderPay.setPayId(orderPay.getPayId());
-            orderPayMapper.updateById(orderPay);
-        } else {
-            orderPayMapper.insert(orderPay);
-        }
+        orderPayMapper.updateById(orderPay);
 
         // 更新订单为已支付
         if (isSuccess) {
-            taOrderMapper.updateStatus(taOrder.getOrderId(), Constants.ORDER_PAYED);
-            taOrderSubMapper.updateStatusByOrder(taOrder.getOrderId(), Constants.ORDER_PAYED);
-        }
-
-        // 支付成功, 发布返现事件
-        if (isSuccess) {
-            PaySuccessEvent evt = new PaySuccessEvent(this, taOrder);
+            if (!StringUtils.isEmpty(orderSubId)) {
+                taOrderSubMapper.updateStatus(orderSubId, Constants.ORDER_PAYED);
+            } else {
+                taOrderMapper.updateStatus(orderId, Constants.ORDER_PAYED);
+                taOrderSubMapper.updateStatusByOrder(orderId, Constants.ORDER_PAYED);
+            }
+
+            PaySuccessEvent evt = new PaySuccessEvent(this, orderPay);
             eventPublisher.publishEvent(evt);
         }
     }
@@ -87,33 +91,135 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
             return;
         }
 
-        // 退款成功
-        boolean isSuccess = WxPayConstants.RefundStatus.SUCCESS.equals(reqInfo.getRefundStatus());
-        if (!isSuccess) {
+        // 退款处理中
+        if (WxPayConstants.RefundStatus.PROCESSING.equals(reqInfo.getRefundStatus())) {
             return;
         }
 
-        TaOrder taOrder = taOrderMapper.selectById(reqInfo.getOutTradeNo());
-        TaOrderPay orderPay = new TaOrderPay();
-        orderPay.setOrderId(taOrder.getOrderId());
-        orderPay.setPersonId(taOrder.getPersonId());
-        orderPay.setCharges(reqInfo.getRefundFee());
+        // 退款成功
+        boolean isSuccess = WxPayConstants.RefundStatus.SUCCESS.equals(reqInfo.getRefundStatus());
+
+        TaOrderPay orderPay = getById(reqInfo.getOutTradeNo());
         orderPay.setPayDate(DateUtils.from(reqInfo.getSuccessTime(), "yyyyMMddHHmmss"));
-        orderPay.setStatus(Constants.PAY_SUCCESS);
-        orderPay.setMessage(null);
-
-        // 如果退款单号 = R + 订单号, 说明是全订单退款
-        // 否则是订单项退款
-        if (!reqInfo.getOutRefundNo().equals("R"+taOrder.getOrderId())) {
-            orderPay.setSubOrderId(reqInfo.getOutRefundNo().substring(1));
-            taOrderSubMapper.updateStatus(orderPay.getSubOrderId(), Constants.ORDER_REFUND);
+        orderPay.setStatus(isSuccess ? Constants.PAY_SUCCESS : Constants.PAY_FAIL);
+        orderPay.setMessage(isSuccess ? null : reqInfo.getRefundStatus());
+
+        orderPayMapper.updateById(orderPay);
+
+        String orderId = orderPay.getOrderId();
+        String orderSubId = orderPay.getSubOrderId();
+        if (isSuccess) {
+            if (StringUtils.isEmpty(orderSubId)) {
+                taOrderMapper.updateStatus(orderId, Constants.ORDER_REFUND);
+                taOrderSubMapper.updateStatusByOrder(orderId, Constants.ORDER_REFUND);
+            } else {
+                taOrderSubMapper.updateStatus(orderSubId, Constants.ORDER_REFUND);
+            }
+
+            RefundSuccessEvent evt = new RefundSuccessEvent(this, orderPay);
+            eventPublisher.publishEvent(evt);
+        }
+    }
+
+    @Override
+    public WxPayMpOrderResult prePay(TaPerson person, TaOrder taOrder) throws Exception {
+        TaOrderPay orderPay = createByOrder(taOrder);
+        orderPayMapper.insert(orderPay);
+
+        return wxPayUtils.createOrder(person, orderPay);
+    }
+
+    @Override
+    public void refundOrderSub(TaPerson taPerson, TaOrder taOrder, TaOrderSub taOrderSub) throws Exception {
+        TaOrderPay originOrderPay = null;
+
+        // 找当前子项目对应的支付记录
+        originOrderPay = orderPayMapper.getLastRowByOrderSub(taOrder.getOrderId(), taOrderSub.getSubOrderId());
+        if (null != originOrderPay) {
+            if (Constants.PAY_SUCCESS.equals(originOrderPay.getStatus())) {
+                throw new Exception("未找到当前订单有效的支付记录");
+            }
         } else {
-            taOrderMapper.updateStatus(orderPay.getOrderId(), Constants.ORDER_REFUND);
+            // 找到主订单对应的那个支付记录
+            originOrderPay = orderPayMapper.getLastRowByOrder(taOrder.getOrderId());
+            if (null != originOrderPay) {
+                if (Constants.PAY_SUCCESS.equals(originOrderPay.getStatus())) {
+                    throw new Exception("未找到当前订单有效的支付记录");
+                }
+            } else {
+                throw new Exception("未找到当前订单有效的支付记录");
+            }
         }
 
+        TaOrderPay orderPay = createByOrderSub(taOrderSub, taPerson);
+        // 退款金额 = 订单金额 - 返现金额
+        orderPay.setCharges(taOrderSub.getCharges() - taOrderSub.getCashback());
+
+        // 发起退款
+        wxPayUtils.refund(originOrderPay, orderPay);
+    }
+
+    @Override
+    public void refundOrder(TaPerson person, TaOrder taOrder, Integer totalCashback) throws Exception {
+        // 找到主订单对应的那个支付记录
+        TaOrderPay originOrderPay = orderPayMapper.getLastRowByOrder(taOrder.getOrderId());
+        if (null != originOrderPay) {
+            if (Constants.PAY_SUCCESS.equals(originOrderPay.getStatus())) {
+                throw new Exception("未找到当前订单有效的支付记录");
+            }
+        } else {
+            throw new Exception("未找到当前订单有效的支付记录");
+        }
+
+        TaOrderPay orderPay = createByOrder(taOrder);
+        // 退款金额 = 订单金额 - 返现金额
+        orderPay.setCharges(taOrder.getCharges() - totalCashback);
+
+        // 发起退款
+        wxPayUtils.refund(originOrderPay, orderPay);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public WxPayMpOrderResult prePay(TaPerson person, TaOrder taOrder, TaOrderSub taOrderSub) throws Exception {
+        TaOrderPay orderPay = createByOrderSub(taOrderSub, person);
         orderPayMapper.insert(orderPay);
 
-        RefundSuccessEvent evt = new RefundSuccessEvent(this, taOrder, null);
-        eventPublisher.publishEvent(evt);
+        return wxPayUtils.createOrder(person, orderPay);
+    }
+
+    private TaOrderPay createByOrder(TaOrder taOrder) throws Exception {
+        // 发给微信的订单号为  订单ID-01 这种
+        Integer no = taSequenceMapper.nextval(taOrder.getOrderId());
+        String payNo = StringUtils.lpad(no.toString(), "0", 2);
+        String payId = taOrder.getOrderId() + "-" + payNo;
+
+        TaOrderPay orderPay = new TaOrderPay();
+        orderPay.setPayId(payId);
+        orderPay.setOrderId(taOrder.getOrderId());
+        orderPay.setPersonId(taOrder.getPersonId());
+        orderPay.setCharges(taOrder.getCharges());
+        orderPay.setDescription(taOrder.getDescription());
+        orderPay.setStatus(Constants.STATUS_READY);
+
+        return orderPay;
+    }
+
+    private TaOrderPay createByOrderSub(TaOrderSub taOrderSub, TaPerson person) throws Exception {
+        // 发给微信的订单号为  订单ID-01 这种
+        Integer no = taSequenceMapper.nextval(taOrderSub.getSubOrderId());
+        String payNo = StringUtils.lpad(no.toString(), "0", 2);
+        String payId = taOrderSub.getSubOrderId() + "-" + payNo;
+
+        TaOrderPay orderPay = new TaOrderPay();
+        orderPay.setPayId(payId);
+        orderPay.setOrderId(taOrderSub.getOrderId());
+        orderPay.setSubOrderId(taOrderSub.getSubOrderId());
+        orderPay.setPersonId(person.getPersonId());
+        orderPay.setCharges(taOrderSub.getCharges());
+        orderPay.setDescription(taOrderSub.getDescription());
+        orderPay.setStatus(Constants.STATUS_READY);
+
+        return orderPay;
     }
 }

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

@@ -31,9 +31,6 @@ import java.util.List;
 @Service
 public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder> implements ITaOrderService {
 
-    @Autowired
-    WxPayUtils wxPayUtils;
-
     @Autowired
     TaShopPackageMapper taShopPackageMapper;
 
@@ -61,14 +58,14 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public WxPayMpOrderResult order(TaPerson person, OrderItem[] orderItems) throws Exception {
+    public TaOrder order(TaPerson person, OrderItem[] orderItems) throws Exception {
         LocalDateTime now = LocalDateTime.now();
 
         // 是否首单
         TaOrder lastOrder = getPersonLastOrder(person.getPersonId());
         boolean isFirstOrder = null == lastOrder;
 
-                // 先生成主订单
+        // 先生成主订单
         TaOrder taOrder = new TaOrder();
         taOrder.setOrderId(getOrderNo());
         taOrder.setDescription("套餐");
@@ -82,8 +79,7 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
         taOrder.setCharges(charge);
         save(taOrder);
 
-        // 发起微信支付订单
-        return wxPayUtils.createOrder(person, taOrder);
+        return taOrder;
     }
 
     /**
@@ -123,6 +119,15 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
         taOrderSubMapper.updateStatusByOrder(taOrder.getOrderId(), Constants.ORDER_CANCEL);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void refundOrder(TaOrder taOrder, TaPerson taPerson) throws Exception {
+
+        // 只需要更新状态即可
+        taOrderMapper.updateStatus(taOrder.getOrderId(), Constants.ORDER_REFUND);
+        taOrderSubMapper.updateStatusByOrder(taOrder.getOrderId(), Constants.ORDER_REFUND);
+    }
+
     /**
      * 获取订单号
      * @return
@@ -133,7 +138,7 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
         String orderNo = null;
         do {
             String random = StringUtils.random(4);
-            orderNo = String.format("%s-%s", today, random);
+            orderNo = String.format("%s%s", today, random);
             TaOrder taOrder = getById(orderNo);
             if (null == taOrder) {
                 break;
@@ -197,6 +202,8 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
                     && shopPackage.getShopId().equals(taPerson.getRecommender());
 
             orderSub.setPackageId(packageId);
+            String desc = StringUtils.ifNull(shopPackage.getDescription(), "套餐项目");
+            orderSub.setDescription(desc.substring(0, 128));
 
             // 价格
             if (!item.getPrice().equals(shopPackage.getActualPrice())) {

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

@@ -1,11 +1,14 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.WxPayUtils;
 import com.yunzhi.shigongli.entity.*;
 import com.yunzhi.shigongli.mapper.*;
 import com.yunzhi.shigongli.service.ITaOrderSubService;
 
+import com.yunzhi.shigongli.vo.MineOrder;
+import com.yunzhi.shigongli.vo.MineOrderSummary;
 import org.omg.PortableInterceptor.ACTIVE;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,6 +31,9 @@ public class TaOrderSubServiceImpl extends BaseServiceImpl<TaOrderSubMapper, TaO
     @Autowired
     WxPayUtils wxPayUtils;
 
+    @Autowired
+    TaOrderMapper taOrderMapper;
+
     @Autowired
     TaOrderSubMapper taOrderSubMapper;
 
@@ -59,8 +65,6 @@ public class TaOrderSubServiceImpl extends BaseServiceImpl<TaOrderSubMapper, TaO
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void refund(TaPerson person, TaOrder taOrder, TaOrderSub taOrderSub) throws Exception {
-        wxPayUtils.refund(taOrder, taOrderSub);
-
         // 更新表
         taOrderSubMapper.updateStatus(taOrderSub.getSubOrderId(), Constants.ORDER_REFUND);
 
@@ -100,6 +104,33 @@ public class TaOrderSubServiceImpl extends BaseServiceImpl<TaOrderSubMapper, TaO
         }
     }
 
+    @Override
+    public IPage<MineOrder> getOrderSubListOf(IPage<MineOrder> pg, TaPerson taPerson, Integer status) {
+
+        return baseMapper.getOrderSubListOf(pg, taPerson.getPersonId(), Constants.TARGET_SHOP, status);
+    }
+
+    @Override
+    public MineOrderSummary getOrderSummary(TaPerson taPerson) {
+        MineOrderSummary orderSummary = new MineOrderSummary();
+
+        int unPayNum = taOrderMapper.getOrderNum(taPerson.getPersonId(), Constants.ORDER_READY);
+        orderSummary.setUnPayNum(unPayNum);
+
+        int unVerifiedNum = taOrderSubMapper.getOrderNum(taPerson.getPersonId(), Constants.ORDER_PAYED);
+        orderSummary.setUnVerifiedNum(unVerifiedNum);
+
+        int refundNum = taOrderSubMapper.getOrderNum(taPerson.getPersonId(), Constants.ORDER_REFUND);
+        orderSummary.setRefundNum(refundNum);
+
+        return orderSummary;
+    }
+
+    @Override
+    public List<TaOrderSub> getListByOrder(TaOrder taOrder) {
+        return taOrderSubMapper.getListByOrder(taOrder.getOrderId());
+    }
+
     /**
      * 商铺抽成入账户
      * @param shopId

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

@@ -1,10 +1,9 @@
 package com.yunzhi.shigongli.service.impl;
 
 import com.yunzhi.shigongli.common.Constants;
-import com.yunzhi.shigongli.entity.TaOrder;
-import com.yunzhi.shigongli.entity.TaOrderSub;
-import com.yunzhi.shigongli.entity.TaPersonAccount;
-import com.yunzhi.shigongli.entity.TaPersonAccountLog;
+import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.entity.*;
+import com.yunzhi.shigongli.mapper.TaOrderMapper;
 import com.yunzhi.shigongli.mapper.TaOrderSubMapper;
 import com.yunzhi.shigongli.mapper.TaPersonAccountLogMapper;
 import com.yunzhi.shigongli.mapper.TaPersonAccountMapper;
@@ -30,6 +29,9 @@ import java.util.List;
 @Service
 public class TaPersonAccountServiceImpl extends BaseServiceImpl<TaPersonAccountMapper, TaPersonAccount> implements ITaPersonAccountService {
 
+    @Autowired
+    TaOrderMapper taOrderMapper;
+
     @Autowired
     TaOrderSubMapper orderSubMapper;
 
@@ -45,12 +47,18 @@ public class TaPersonAccountServiceImpl extends BaseServiceImpl<TaPersonAccountM
     @Async
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void cashback(TaOrder taOrder) throws Exception {
-        List<TaOrderSub> orderSubList = orderSubMapper.getListByOrder(taOrder.getOrderId());
-
+    public void cashback(TaOrderPay taOrderPay) throws Exception {
+        String orderId = taOrderPay.getOrderId();
+        String orderSubId = taOrderPay.getSubOrderId();
+        TaOrder taOrder = taOrderMapper.selectById(orderId);
         Integer cashback = 0;
-        for(TaOrderSub item : orderSubList) {
-            cashback += item.getCashback();
+        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());
@@ -62,9 +70,9 @@ public class TaPersonAccountServiceImpl extends BaseServiceImpl<TaPersonAccountM
         accountLog.setAmountType(Constants.ACCOUNT_CASHBACK);
         accountLog.setAmount(cashback);
         accountLog.setSignType(Constants.ACCOUNT_INCOME);
-        accountLog.setTargetType(Constants.TARGET_ORDER);
-        accountLog.setTargetId(taOrder.getOrderId());
-        accountLog.setOrderId(taOrder.getOrderId());
+        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/TaResourceServiceImpl.java

@@ -101,4 +101,16 @@ public class TaResourceServiceImpl extends BaseServiceImpl<TaResourceMapper, TaR
 
         return baseMapper.getWxPagedBy(pg, taPerson.getPersonId(), location, typeId);
     }
+
+    @Override
+    public void updateLike(TaLike taLike, int num) {
+        if (null == taLike) return;
+
+        TaResource taResource = getByTarget(taLike.getTargetType(), taLike.getTargetId());
+        if (null == taResource) {
+            return;
+        }
+
+        baseMapper.updateQuota("like_num", taLike.getTargetType(), taLike.getTargetId(), num);
+    }
 }

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

@@ -0,0 +1,28 @@
+package com.yunzhi.shigongli.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel(description = "民宿列表")
+@Data
+public class EvaluateTarget {
+
+    @ApiModelProperty(value = "对象类型")
+    private String TargetType;
+
+    @ApiModelProperty(value = "对象ID")
+    private String TargetId;
+
+    @ApiModelProperty(value = "口味评分")
+    private Integer sweetScore;
+
+    @ApiModelProperty(value = "环境评分")
+    private Integer environmentScore;
+
+    @ApiModelProperty(value = "服务评分")
+    private Integer serviceScore;
+}

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

@@ -0,0 +1,63 @@
+package com.yunzhi.shigongli.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@ApiModel(value="MineOrder", description="我的订单")
+@Data
+public class MineOrder {
+
+    @ApiModelProperty(value = "订单号")
+    private String orderId;
+
+    @ApiModelProperty(value = "子订单ID")
+    private String subOrderId;
+
+    @ApiModelProperty(value = "商铺ID")
+    private String shopId;
+
+    @ApiModelProperty(value = "套餐ID")
+    private String packageId;
+
+    @ApiModelProperty(value = "描述")
+    private String packageDescription;
+
+    @ApiModelProperty(value = "主图")
+    private String poster;
+
+    @ApiModelProperty(value = "综合评分")
+    private Float score;
+
+    @ApiModelProperty(value = "总金额;单位分")
+    private Integer charges;
+
+    @ApiModelProperty(value = "数量")
+    private Integer amount;
+
+    @ApiModelProperty(value = "单价;单位分")
+    private Integer unitPrice;
+
+    @ApiModelProperty(value = "抽成;单位分")
+    private Integer commissionCharge;
+
+    @ApiModelProperty(value = "返现金额;单位分")
+    private Integer cashback;
+
+    @ApiModelProperty(value = "是否核销")
+    private Boolean isVerified;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "核销时间")
+    private LocalDateTime verifiedDate;
+
+    @ApiModelProperty(value = "是否已评价")
+    private Integer isEvaluated;
+}

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

@@ -0,0 +1,20 @@
+package com.yunzhi.shigongli.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value="MineOrderSummary", description="我的订单")
+@Data
+public class MineOrderSummary {
+
+    @ApiModelProperty(value = "待支付订单数")
+    private Integer unPayNum;
+
+    @ApiModelProperty(value = "待核销订单数")
+    private Integer unVerifiedNum;
+
+    @ApiModelProperty(value = "退款订单数")
+    private Integer refundNum;
+}

src/main/resources/mapper/TaOrderMapper.xml

@@ -8,4 +8,13 @@
         WHERE
             order_id = #{orderId}
     </update>
+    <select id="getOrderNum" resultType="java.lang.Integer">
+        SELECT
+            count( 1 ) AS cnt
+        FROM
+            ta_order t
+        WHERE
+            t.person_id = #{personId}
+          AND t.`status` = #{status}
+    </select>
 </mapper>

src/main/resources/mapper/TaOrderPayMapper.xml

@@ -17,4 +17,28 @@
           </if>
             AND is_refund = 0
     </select>
+    <select id="getLastRowByOrder" resultType="com.yunzhi.shigongli.entity.TaOrderPay">
+        SELECT
+            *
+        FROM
+            ta_order_pay t
+        WHERE
+            t.order_id = #{orderId}
+          AND ( t.sub_order_id IS NULL OR t.sub_order_id = '' )
+        ORDER BY
+            t.create_date DESC
+            LIMIT 1
+    </select>
+    <select id="getLastRowByOrderSub" resultType="com.yunzhi.shigongli.entity.TaOrderPay">
+        SELECT
+            *
+        FROM
+            ta_order_pay t
+        WHERE
+            t.order_id = #{orderId}
+          AND t.sub_order_id = #{subOrderId}
+        ORDER BY
+            t.create_date DESC
+            LIMIT 1
+    </select>
 </mapper>

src/main/resources/mapper/TaOrderSubMapper.xml

@@ -27,4 +27,48 @@
             order_id = #{orderId}
             AND `status` > -1
     </select>
+    <select id="getOrderSubListOf" resultType="com.yunzhi.shigongli.vo.MineOrder">
+        SELECT
+            t.*,
+            ( m.sweet_score + m.environment_score + m.service_score ) / 3 AS score,
+            n.description AS package_description,
+            n.poster,
+            (
+            SELECT
+                count( 1 )
+            FROM
+                ta_evaluation a
+            WHERE
+                a.target_type = #{shopTarget}
+                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
+
+        WHERE
+            s.person_id = #{personId}
+          AND s.`status` &gt; - 1
+          <if test="status == null">
+              AND t.`status` &gt; - 1
+          </if>
+          <if test="status != null">
+              AND t.`status` = #{status}
+          </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
+    <select id="getOrderNum" resultType="java.lang.Integer">
+        SELECT
+            COUNT( 1 ) AS cnt
+        FROM
+            ta_order_sub t
+                INNER JOIN ta_order s ON s.order_id = t.order_id
+        WHERE
+            s.person_id = #{personId}
+          AND t.`status` = #{status}
+          AND s.`status` &gt; -1
+    </select>
 </mapper>

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

src/main/resources/mapper/TaShopMapper.xml

@@ -7,6 +7,27 @@
         WHERE
             t.shop_id = #{id}
     </update>
+    <update id="updateScore">
+        UPDATE ta_shop t
+        INNER JOIN (
+            SELECT
+                s.target_type,
+                s.target_id,
+                s.evaluate_type,
+                ( sum( s.score ) / count( 1 ) ) AS score
+            FROM
+                ta_evaluation s
+            WHERE
+                s.target_type = #{targetType}
+                AND s.target_id = #{targetId}
+                AND s.evaluate_type = #{evaluateType}
+            GROUP BY
+                s.target_type,
+                s.target_id,
+                s.evaluate_type
+            ) a ON a.target_id = t.shop_id
+            SET t.${field} = score
+    </update>
 
     <select id="getPageListBy" resultType="com.yunzhi.shigongli.vo.ShopListVO">
         SELECT

src/main/resources/mapper/TaTargetQuotaMapper.xml

@@ -41,6 +41,7 @@
                     AND s.target_id = t.target_id
                     AND s.type_id = #{typeId}
             </if>
+            WHERE t.`status` = 1
         ) w
         ORDER BY
             IFNULL( w.weight, 0 ) DESC,