feats

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

@@ -0,0 +1,19 @@
+package com.yunzhi.shigongli.common;
+
+import com.yunzhi.shigongli.service.ITaHotelAccountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Component
+public class CommUtils {
+
+    @Autowired
+    ITaHotelAccountService iTaHotelAccountService;
+
+    @PostConstruct
+    public void init() {
+        iTaHotelAccountService.initSystemAccount();
+    }
+}

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

@@ -20,12 +20,23 @@ public class Constants {
     public final static String COMMISSION_TRAFFIC = "traffic";  // 引流抽成
     public final static String COMMISSION_PLATFORM = "platform";  // 平台抽成
 
+    // 平台账户ID
+    public final static String SYSTEM_ACCOUNT_ID = "sys_plat";
+
     // 账户流水
     public final static Integer ACCOUNT_INCOME = 1;     // 收入
     public final static Integer ACCOUNT_EXPENSE = -1;   // 支出
 
+    // 账户金额类型
+    public final static String ACCOUNT_CASHBACK = "cashback";       // 返现
+    public final static String ACCOUNT_COMMISSION = "commission";   // 抽成
+
     // 系统模块
     public final static String TARGET_ORDER = "order";  // 订单
     public final static String TARGET_HOTEL = "hotel";  // 民宿
     public final static String TARGET_SHOP = "shop";    // 商铺
+
+    // 推荐人类型
+    public final static String RECOMMEND_SHOP = "shop";     // 商铺
+    public final static String RECOMMEND_HOTEL = "hotel";   // 民宿
 }

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.TaOrderSub;
 import com.yunzhi.shigongli.entity.TaPerson;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -49,7 +50,7 @@ public class WxPayUtils {
     }
 
     /**
-     * 退款
+     * 订单退款
      * @param taOrder
      * @param cashback
      * @return
@@ -71,4 +72,28 @@ public class WxPayUtils {
 
         return result;
     }
+
+    /**
+     * 订单项目退款
+     * @param taOrder
+     * @param taOrderSub
+     * @return
+     * @throws Exception
+     */
+    public WxPayRefundResult refund(TaOrder taOrder, TaOrderSub taOrderSub) 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.setNotifyUrl(config.getPay().getRefundNotifyUrl());
+        WxPayRefundResult result = payService.refund(refundRequest);
+
+        if (!WxPayConstants.ResultCode.SUCCESS.equals(result.getResultCode())) {
+            throw new Exception(result.getErrCodeDes());
+        }
+
+        return result;
+    }
 }

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

@@ -1,10 +1,13 @@
 package com.yunzhi.shigongli.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.vo.HotelListVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +23,8 @@ import com.yunzhi.shigongli.service.ITaHotelService;
 import com.yunzhi.shigongli.entity.TaHotel;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 民宿 前端控制器
@@ -50,14 +55,13 @@ public class TaHotelController extends BaseController {
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taHotelList(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
                                     @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                    @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                    @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @ApiParam("名称") @RequestParam(value = "hotelName",required = false) String hotelName) throws Exception{
 
-		    IPage<TaHotel> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaHotel> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
 
-            IPage<TaHotel> result = iTaHotelService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaHotel> pg = new Page<>(pageNum, pageSize);
+        IPage<HotelListVO> result = iTaHotelService.getVOListBy(pg, hotelName);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -69,7 +73,12 @@ public class TaHotelController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taHotelAdd(@ApiParam("保存内容") @RequestBody TaHotel taHotel) throws Exception{
 
-        if (iTaHotelService.save(taHotel)){
+        List<TaHotel> lst = iTaHotelService.getByName(taHotel.getHotelName());
+        if (null != lst && lst.size() > 0) {
+            return ResponseBean.error("民宿名称已存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (iTaHotelService.createNew(taHotel)){
             return ResponseBean.success(taHotel);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -83,7 +92,7 @@ public class TaHotelController extends BaseController {
     @RequestMapping(value="/admin/taHotel/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean taHotelDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        if(iTaHotelService.removeById(id)){
+        if(iTaHotelService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -101,6 +110,11 @@ public class TaHotelController extends BaseController {
     public ResponseBean taHotelUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaHotel taHotel) throws Exception{
 
+        List<TaHotel> lst = iTaHotelService.getByName(taHotel.getHotelName());
+        if (null != lst && lst.size() > 0) {
+            return ResponseBean.error("民宿名称已存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         if (iTaHotelService.updateById(taHotel)){
             return ResponseBean.success(iTaHotelService.getById(id));
         }else {

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

@@ -123,32 +123,32 @@ public class TaOrderController extends BaseController {
 //        }
 //    }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taOrder 实体对象
-     * @return
-     */
-    @RequestMapping(value="/wx/taOrder/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taOrderUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaOrder taOrder) throws Exception{
-
-        if (iTaOrderService.updateById(taOrder)){
-            return ResponseBean.success(iTaOrderService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/{plat}/taOrder/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taOrderGet(@ApiParam("客户端") @PathVariable String plat,
-                                   @ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaOrderService.getById(id));
-    }
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taOrder 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/wx/taOrder/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taOrderUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaOrder taOrder) throws Exception{
+//
+//        if (iTaOrderService.updateById(taOrder)){
+//            return ResponseBean.success(iTaOrderService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/{plat}/taOrder/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taOrderGet(@ApiParam("客户端") @PathVariable String plat,
+//                                   @ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaOrderService.getById(id));
+//    }
 }

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

@@ -4,21 +4,20 @@ 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.entity.TaOrder;
+import com.yunzhi.shigongli.entity.TaPerson;
+import com.yunzhi.shigongli.service.ITaOrderService;
 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.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 import com.yunzhi.shigongli.service.ITaOrderSubService;
 import com.yunzhi.shigongli.entity.TaOrderSub;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -39,6 +38,8 @@ public class TaOrderSubController extends BaseController {
     @Autowired
     public ITaOrderSubService iTaOrderSubService;
 
+    @Autowired
+    public ITaOrderService iTaOrderService;
 
     /**
      * 分页查询列表
@@ -61,35 +62,89 @@ public class TaOrderSubController extends BaseController {
     }
 
     /**
-     * 保存对象
-     * @param taOrderSub 实体对象
+     * 订单项目退款
+     * @param id
      * @return
+     * @throws Exception
      */
-    @RequestMapping(value="/wx/taOrderSub",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taOrderSubAdd(@ApiParam("保存内容") @RequestBody TaOrderSub taOrderSub) throws Exception{
-
-        if (iTaOrderSubService.save(taOrderSub)){
-            return ResponseBean.success(taOrderSub);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+    @DeleteMapping("/wx/orderSub/{id}/refund")
+    @ApiOperation(value="订单项目退款", notes = "订单项目退款", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean refund(@ApiParam(value = "订单项目ID") @PathVariable String id) throws Exception {
+        TaOrderSub taOrderSub = iTaOrderSubService.getById(id);
+        if (Constants.STATUS_DELETED.equals(taOrderSub.getStatus())) {
+            return ResponseBean.error("未找到退款项目", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaOrder taOrder = iTaOrderService.getById(taOrderSub.getOrderId());
+        if (Constants.STATUS_DELETED.equals(taOrder.getStatus())) {
+            return ResponseBean.error("未找到当前订单", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (!Constants.ORDER_PAYED.equals(taOrderSub.getStatus())) {
+            return ResponseBean.error("当前项目未支付", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
+
+        TaPerson taPerson = getCurrentPerson();
+
+        if (!taPerson.getPersonId().equals(taOrder.getPersonId())) {
+            return ResponseBean.error("您无权操作当前订单项目", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        iTaOrderSubService.refund(taPerson, taOrder, taOrderSub);
+
+        return ResponseBean.success("操作完成");
     }
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/wx/taOrderSub/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taOrderSubDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaOrderSubService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+    @PutMapping("/wx/orderSub/{id}/valid")
+    @ApiOperation(value="订单项目核销", notes = "订单项目核销", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean valdiation(@ApiParam(value = "订单项目ID") @PathVariable String id) throws Exception {
+        TaPerson taPerson = getCurrentPerson();
+        TaOrderSub taOrderSub = iTaOrderSubService.getById(id);
+        TaOrder taOrder = iTaOrderService.getById(taOrderSub.getOrderId());
+
+        if (!taPerson.getPersonId().equals(taOrder.getPersonId())) {
+            return ResponseBean.error("您不能核销当前套餐", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
+
+        if (!Constants.ORDER_PAYED.equals(taOrderSub.getStatus())) {
+            return ResponseBean.error("套餐未支付或者状态异常", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        iTaOrderSubService.validation(taPerson, taOrder, taOrderSub);
+
+        return ResponseBean.success("核销成功");
     }
 
+//    /**
+//     * 保存对象
+//     * @param taOrderSub 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/wx/taOrderSub",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean taOrderSubAdd(@ApiParam("保存内容") @RequestBody TaOrderSub taOrderSub) throws Exception{
+//
+//        if (iTaOrderSubService.save(taOrderSub)){
+//            return ResponseBean.success(taOrderSub);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/wx/taOrderSub/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taOrderSubDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaOrderSubService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
 //    /**
 //     * 修改对象
 //     * @param id  实体ID

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

@@ -5,6 +5,7 @@ import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.yunzhi.shigongli.common.BaseController;
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.WxUtils;
 import com.yunzhi.shigongli.service.ITaOrderPayService;
 import io.swagger.annotations.Api;

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

@@ -64,5 +64,6 @@ public class TaOrderSub implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-
+    @ApiModelProperty(value = "核销时间")
+    private LocalDateTime verifiedDate;
 }

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

@@ -0,0 +1,23 @@
+package com.yunzhi.shigongli.event.listener;
+
+import com.yunzhi.shigongli.entity.TaOrder;
+import com.yunzhi.shigongli.entity.TaOrderSub;
+import com.yunzhi.shigongli.event.RefundSuccessEvent;
+import com.yunzhi.shigongli.service.ITaPersonAccountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RefundSuccessEventListener  implements ApplicationListener<RefundSuccessEvent> {
+    @Autowired
+    ITaPersonAccountService personAccountService;
+
+    @Override
+    public void onApplicationEvent(RefundSuccessEvent evt) {
+        TaOrder taOrder = evt.getTaOrder();
+        TaOrderSub taOrderSub = evt.getTaOrderSub();
+
+        // 暂时不需要处理什么
+    }
+}

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

@@ -3,6 +3,7 @@ package com.yunzhi.shigongli.mapper;
 import com.yunzhi.shigongli.entity.TaHotelAccount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +16,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaHotelAccountMapper extends BaseMapper<TaHotelAccount> {
 
+    TaHotelAccount selectByHotel(@Param("hotelId") String hotelId);
+
+    int updateCommission(@Param("accountId") String accountId, @Param("amount") Integer amount);
 }

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

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

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

@@ -3,6 +3,9 @@ package com.yunzhi.shigongli.mapper;
 import com.yunzhi.shigongli.entity.TaOrderCommission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaOrderCommissionMapper extends BaseMapper<TaOrderCommission> {
 
+    List<TaOrderCommission> getListByOrderSub(@Param("subOrderId") String subOrderId);
 }

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

@@ -21,4 +21,8 @@ public interface TaOrderSubMapper extends BaseMapper<TaOrderSub> {
     int updateStatusByOrder(@Param("orderId") String orderId, @Param("status") Integer status);
 
     List<TaOrderSub> getListByOrder(@Param("orderId") String orderId);
+
+    int updateStatus(@Param("subOrderId") String subOrderId, @Param("status") Integer status);
+
+    int updateVerified(@Param("subOrderId") String subOrderId, @Param("isVerified") int isVerified);
 }

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

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

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

@@ -3,6 +3,7 @@ package com.yunzhi.shigongli.mapper;
 import com.yunzhi.shigongli.entity.TaShopAccount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +16,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaShopAccountMapper extends BaseMapper<TaShopAccount> {
 
+    TaShopAccount selectByShop(@Param("shopId") String shopId);
+
+    int updateCommission(@Param("accountId") String accountId, @Param("amount") Integer amount);
 }

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

@@ -0,0 +1,9 @@
+package com.yunzhi.shigongli.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.io.Serializable;
+
+public interface IBaseService<T> extends IService<T> {
+    boolean removeLogicById(Serializable id);
+}

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

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaHotelAccountService extends IService<TaHotelAccount> {
 
+    void initSystemAccount();
 }

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

@@ -1,7 +1,11 @@
 package com.yunzhi.shigongli.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaHotel;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.shigongli.vo.HotelListVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +15,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2021-08-17
  */
-public interface ITaHotelService extends IService<TaHotel> {
+public interface ITaHotelService extends IBaseService<TaHotel> {
+
+    List<TaHotel> getByName(String hotelName);
+
+    boolean createNew(TaHotel taHotel) throws Exception;
 
+    IPage<HotelListVO> getVOListBy(IPage<TaHotel> pg, String hotelName);
 }

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

@@ -1,7 +1,9 @@
 package com.yunzhi.shigongli.service;
 
+import com.yunzhi.shigongli.entity.TaOrder;
 import com.yunzhi.shigongli.entity.TaOrderSub;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.shigongli.entity.TaPerson;
 
 /**
  * <p>
@@ -13,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaOrderSubService extends IService<TaOrderSub> {
 
+    void refund(TaPerson person, TaOrder taOrder, TaOrderSub taOrderSub) throws Exception;
+
+    void validation(TaPerson taPerson, TaOrder taOrder, TaOrderSub taOrderSub) throws Exception;
 }

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.TaOrderSub;
 import com.yunzhi.shigongli.entity.TaPersonAccount;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -15,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ITaPersonAccountService extends IService<TaPersonAccount> {
 
     void cashback(TaOrder taOrder) throws Exception;
+
 }

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

@@ -0,0 +1,23 @@
+package com.yunzhi.shigongli.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.yunzhi.shigongli.service.IBaseService;
+
+import java.io.Serializable;
+
+public class BaseServiceImpl <M extends BaseMapper<T>, T> extends ServiceImpl <M, T> implements IBaseService<T> {
+    @Override
+    public boolean removeLogicById(Serializable id) {
+
+        TableInfo tableInfo = SqlHelper.table(currentModelClass());
+        UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("status", -1)
+                .eq(tableInfo.getKeyColumn(), id);
+
+        return update(updateWrapper);
+    }
+}

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

@@ -1,9 +1,12 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.entity.TaHotelAccount;
 import com.yunzhi.shigongli.mapper.TaHotelAccountMapper;
 import com.yunzhi.shigongli.service.ITaHotelAccountService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.omg.PortableInterceptor.ACTIVE;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,19 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaHotelAccountServiceImpl extends ServiceImpl<TaHotelAccountMapper, TaHotelAccount> implements ITaHotelAccountService {
 
+    @Async
+    @Override
+    public void initSystemAccount() {
+        try {
+            TaHotelAccount account = getById(Constants.SYSTEM_ACCOUNT_ID);
+            if (null == account) {
+                account = new TaHotelAccount();
+                account.setAccountId(Constants.SYSTEM_ACCOUNT_ID);
+                account.setHotelId(Constants.SYSTEM_ACCOUNT_ID);
+                save(account);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -1,10 +1,20 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.entity.TaHotel;
+import com.yunzhi.shigongli.entity.TaHotelAccount;
+import com.yunzhi.shigongli.mapper.TaHotelAccountMapper;
 import com.yunzhi.shigongli.mapper.TaHotelMapper;
 import com.yunzhi.shigongli.service.ITaHotelService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.shigongli.vo.HotelListVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,6 +25,37 @@ import org.springframework.stereotype.Service;
  * @since 2021-08-17
  */
 @Service
-public class TaHotelServiceImpl extends ServiceImpl<TaHotelMapper, TaHotel> implements ITaHotelService {
+public class TaHotelServiceImpl extends BaseServiceImpl<TaHotelMapper, TaHotel> implements ITaHotelService {
+
+    @Autowired
+    TaHotelMapper hotelMapper;
+
+    @Autowired
+    TaHotelAccountMapper accountMapper;
+
+    @Override
+    public List<TaHotel> getByName(String hotelName) {
+        LambdaQueryWrapper<TaHotel> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaHotel::getHotelName, hotelName)
+                .gt(TaHotel::getStatus, Constants.STATUS_DELETED)
+                .orderByDesc(TaHotel::getCreateDate);
+        return list(queryWrapper);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean createNew(TaHotel taHotel) throws Exception {
+        save(taHotel);
+
+        TaHotelAccount account = new TaHotelAccount();
+        account.setHotelId(taHotel.getHotelId());
+        accountMapper.insert(account);
+
+        return false;
+    }
 
+    @Override
+    public IPage<HotelListVO> getVOListBy(IPage<TaHotel> pg, String hotelName) {
+        return hotelMapper.getVOListBy(pg, hotelName);
+    }
 }

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

@@ -93,27 +93,27 @@ public class TaOrderPayServiceImpl extends ServiceImpl<TaOrderPayMapper, TaOrder
             return;
         }
 
-        // 此处不能更新订单状态
-        // 因为退款分2种情况, 1退款申请, 2订单取消
-
         TaOrder taOrder = taOrderMapper.selectById(reqInfo.getOutTradeNo());
+        TaOrderPay orderPay = new TaOrderPay();
+        orderPay.setOrderId(taOrder.getOrderId());
+        orderPay.setPersonId(taOrder.getPersonId());
+        orderPay.setCharges(reqInfo.getRefundFee());
+        orderPay.setPayDate(DateUtils.from(reqInfo.getSuccessTime(), "yyyyMMddHHmmss"));
+        orderPay.setStatus(Constants.PAY_SUCCESS);
+        orderPay.setMessage(null);
 
         // 如果退款单号 = R + 订单号, 说明是全订单退款
-        if (reqInfo.getOutRefundNo().equals("R"+taOrder.getOrderId())) {
-            TaOrderPay orderPay = new TaOrderPay();
-            orderPay.setOrderId(taOrder.getOrderId());
-            orderPay.setPersonId(taOrder.getPersonId());
-            orderPay.setCharges(reqInfo.getRefundFee());
-            orderPay.setPayDate(DateUtils.from(reqInfo.getSuccessTime(), "yyyyMMddHHmmss"));
-            orderPay.setStatus(isSuccess ? Constants.PAY_SUCCESS : Constants.PAY_FAIL);
-            orderPay.setMessage(isSuccess ? null : result.getReturnMsg());
-            orderPayMapper.insert(orderPay);
-
-            RefundSuccessEvent evt = new RefundSuccessEvent(this, taOrder, null);
-            eventPublisher.publishEvent(evt);
-            return;
+        // 否则是订单项退款
+        if (!reqInfo.getOutRefundNo().equals("R"+taOrder.getOrderId())) {
+            orderPay.setSubOrderId(reqInfo.getOutRefundNo().substring(1));
+            taOrderSubMapper.updateStatus(orderPay.getSubOrderId(), Constants.ORDER_REFUND);
+        } else {
+            taOrderMapper.updateStatus(orderPay.getOrderId(), Constants.ORDER_REFUND);
         }
 
+        orderPayMapper.insert(orderPay);
 
+        RefundSuccessEvent evt = new RefundSuccessEvent(this, taOrder, null);
+        eventPublisher.publishEvent(evt);
     }
 }

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

@@ -1,10 +1,18 @@
 package com.yunzhi.shigongli.service.impl;
 
-import com.yunzhi.shigongli.entity.TaOrderSub;
-import com.yunzhi.shigongli.mapper.TaOrderSubMapper;
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.omg.PortableInterceptor.ACTIVE;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +25,132 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaOrderSubServiceImpl extends ServiceImpl<TaOrderSubMapper, TaOrderSub> implements ITaOrderSubService {
 
+    @Autowired
+    WxPayUtils wxPayUtils;
+
+    @Autowired
+    TaOrderSubMapper taOrderSubMapper;
+
+    @Autowired
+    TaOrderCommissionMapper commissionMapper;
+
+    @Autowired
+    TaPersonRecommenderMapper recommenderMapper;
+
+    @Autowired
+    TaShopAccountMapper shopAccountMapper;
+
+    @Autowired
+    TaShopAccountLogMapper shopAccountLogMapper;
+
+    @Autowired
+    TaHotelAccountMapper hotelAccountMapper;
+
+    @Autowired
+    TaHotelAccountLogMapper hotelAccountLogMapper;
+
+    /**
+     * 订单项目退款
+     * @param person
+     * @param taOrder
+     * @param taOrderSub
+     * @throws Exception
+     */
+    @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);
+
+        // 后面的业务, 比如退款之后, 扣除个人账户之类的
+        // 交给退款成功之后的回调处理
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void validation(TaPerson taPerson, TaOrder taOrder, TaOrderSub taOrderSub) throws Exception {
+        // 先更新状态
+        taOrderSubMapper.updateVerified(taOrderSub.getSubOrderId(), 1);
+
+        // 获取当前人员的推荐人
+        TaPersonRecommender recommender = recommenderMapper.getAcitveRecommender(taPerson.getPersonId());
+
+        // 查询分佣表
+        List<TaOrderCommission> commissionList = commissionMapper.getListByOrderSub(taOrderSub.getSubOrderId());
+
+        for (TaOrderCommission commission : commissionList) {
+            // 流量抽成
+            if (Constants.COMMISSION_TRAFFIC.equals(commission.getCommissionType())) {
+                if (Constants.RECOMMEND_SHOP.equals(recommender.getFromType())) {
+                    // 如果是商户推荐的
+                    createShopAccountLog(recommender.getRecommender(), commission);
+                } else if (Constants.RECOMMEND_HOTEL.equals(recommender.getFromType())) {
+                    // 如果是民宿推荐的
+                    createHotelAccountLog(recommender.getRecommender(), commission);
+                }
+            }
+
+            // 平台抽成
+            if (Constants.COMMISSION_PLATFORM.equals(commission.getCommissionType())) {
+                // 平台账户暂时用民宿代替
+                createHotelAccountLog(Constants.SYSTEM_ACCOUNT_ID, commission);
+            }
+        }
+    }
+
+    /**
+     * 商铺抽成入账户
+     * @param shopId
+     * @param commission
+     * @throws Exception
+     */
+    private void createShopAccountLog(String shopId, TaOrderCommission commission) throws Exception {
+        TaShopAccount account = shopAccountMapper.selectByShop(shopId);
+
+        // 先插入明细
+        TaShopAccountLog accountLog = new TaShopAccountLog();
+        accountLog.setAccountId(account.getAccountId());
+        accountLog.setShopId(shopId);
+        accountLog.setSignType(commission.getCharge() > 0 ? Constants.ACCOUNT_INCOME : Constants.ACCOUNT_EXPENSE);
+        accountLog.setAmountType(Constants.ACCOUNT_COMMISSION);
+        accountLog.setAmount(commission.getCharge());
+        accountLog.setTargetType(Constants.TARGET_ORDER);
+        accountLog.setTargetId(commission.getOrderId());
+        accountLog.setOrderId(commission.getOrderId());
+        accountLog.setSubOrderId(commission.getSubOrderId());
+        accountLog.setCreateDate(LocalDateTime.now());
+        shopAccountLogMapper.insert(accountLog);
+
+        // 再累计到账户
+        shopAccountMapper.updateCommission(account.getAccountId(), accountLog.getAmount());
+    }
+
+    /**
+     * 民宿抽成入账户
+     * @param hotelId
+     * @param commission
+     * @throws Exception
+     */
+    private void createHotelAccountLog(String hotelId, TaOrderCommission commission) throws Exception {
+        TaHotelAccount account = hotelAccountMapper.selectByHotel(hotelId);
+
+        // 先插入明细
+        TaHotelAccountLog accountLog = new TaHotelAccountLog();
+        accountLog.setAccountId(account.getAccountId());
+        accountLog.setHotelId(hotelId);
+        accountLog.setSignType(commission.getCharge() > 0 ? Constants.ACCOUNT_INCOME : Constants.ACCOUNT_EXPENSE);
+        accountLog.setAmountType(Constants.ACCOUNT_COMMISSION);
+        accountLog.setAmount(commission.getCharge());
+        accountLog.setTargetType(Constants.TARGET_ORDER);
+        accountLog.setTargetId(commission.getOrderId());
+        accountLog.setOrderId(commission.getOrderId());
+        accountLog.setSubOrderId(commission.getSubOrderId());
+        accountLog.setCreateDate(LocalDateTime.now());
+        hotelAccountLogMapper.insert(accountLog);
+
+        // 再累计到账户
+        hotelAccountMapper.updateCommission(account.getAccountId(), accountLog.getAmount());
+    }
 }

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

@@ -59,6 +59,7 @@ public class TaPersonAccountServiceImpl extends ServiceImpl<TaPersonAccountMappe
         TaPersonAccountLog accountLog = new TaPersonAccountLog();
         accountLog.setAccountId(personAccount.getAccountId());
         accountLog.setPersonId(taOrder.getPersonId());
+        accountLog.setAmountType(Constants.ACCOUNT_CASHBACK);
         accountLog.setAmount(cashback);
         accountLog.setSignType(Constants.ACCOUNT_INCOME);
         accountLog.setTargetType(Constants.TARGET_ORDER);
@@ -66,4 +67,5 @@ public class TaPersonAccountServiceImpl extends ServiceImpl<TaPersonAccountMappe
         accountLog.setOrderId(taOrder.getOrderId());
         accountLogMapper.insert(accountLog);
     }
+
 }

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

@@ -0,0 +1,40 @@
+package com.yunzhi.shigongli.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "民宿列表")
+@Data
+public class HotelListVO {
+
+    @ApiModelProperty(value = "民宿ID")
+    private String hotelId;
+
+    @ExcelProperty(value = "民宿名称", index = 0)
+    @ApiModelProperty(value = "民宿名称")
+    private String hotelName;
+
+    @ApiModelProperty(value = "logo")
+    private String logo;
+
+    @ExcelProperty(value = "员工数量", index = 1)
+    @ApiModelProperty("员工数量")
+    private Integer workerNum;
+
+    @ExcelProperty(value = "房源数", index = 2)
+    @ApiModelProperty("房源数")
+    private Integer roomNum;
+
+    @ExcelProperty(value = "佣金金额/单价分", index = 3)
+    @ApiModelProperty("佣金金额")
+    private Integer brokerageCharges;
+
+    @ExcelProperty(value = "已结算佣金/单价分", index = 4)
+    @ApiModelProperty("已结算佣金")
+    private Integer paidCharges;
+
+    @ApiModelProperty("状态")
+    private Integer status;
+}

src/main/resources/mapper/TaHotelAccountMapper.xml

@@ -1,5 +1,20 @@
 <?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.TaHotelAccountMapper">
+    <update id="updateCommission">
+        UPDATE ta_hotel_account
+        SET amounts = amounts + ${amount},
+            brokerage_charges = brokerage_charges + ${amount}
+        WHERE
+            account_id = #{accountId}
+    </update>
 
+    <select id="selectByHotel" resultType="com.yunzhi.shigongli.entity.TaHotelAccount">
+        SELECT
+            *
+        FROM
+            ta_hotel_account
+        WHERE
+            hotel_id = #{hotelId}
+    </select>
 </mapper>

src/main/resources/mapper/TaHotelMapper.xml

@@ -2,4 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaHotelMapper">
 
+    <select id="getVOListBy" resultType="com.yunzhi.shigongli.vo.HotelListVO">
+        SELECT
+            t.*,
+            s.brokerage_charges,
+            s.paid_charges,
+            ( SELECT count( * ) FROM ta_hotel_worker a WHERE a.hotel_id = t.hotel_id AND a.`status` > - 1 ) AS worker_num,
+            ( SELECT count( * ) FROM ta_room b WHERE b.hotel_id = t.hotel_id AND b.`status` > - 1 ) AS room_num
+        FROM
+            ta_hotel t
+                INNER JOIN ta_hotel_account s ON t.hotel_id = s.hotel_id
+        WHERE 1 = 1
+          <if test="hotelName != null and hotelName != ''">
+              AND t.hotel_name LIKE CONCAT( '%', #{hotelName}, '%' )
+          </if>
+            AND t.`status` > - 1
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaOrderCommissionMapper.xml

@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaOrderCommissionMapper">
 
+    <select id="getListByOrderSub" resultType="com.yunzhi.shigongli.entity.TaOrderCommission">
+        SELECT
+            *
+        FROM
+            ta_order_commission
+        WHERE
+            sub_order_id = #{subOrderId}
+    </select>
 </mapper>

src/main/resources/mapper/TaOrderSubMapper.xml

@@ -8,6 +8,19 @@
         WHERE
             order_id = #{orderId}
     </update>
+    <update id="updateStatus">
+        UPDATE ta_order_sub
+        SET `status` = #{status}
+        WHERE
+            sub_order_id = #{subOrderId}
+    </update>
+    <update id="updateVerified">
+        UPDATE ta_order_sub
+        SET is_verified = #{isVerified},
+            verified_date = now()
+        WHERE
+            sub_order_id = #{subOrderId}
+    </update>
     <select id="getListByOrder" resultType="com.yunzhi.shigongli.entity.TaOrderSub">
         SELECT * FROM ta_order_sub
         WHERE

src/main/resources/mapper/TaPersonRecommenderMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaPersonRecommenderMapper">
 
+    <select id="getAcitveRecommender" resultType="com.yunzhi.shigongli.entity.TaPersonRecommender">
+        SELECT
+            *
+        FROM
+            ta_person_recommender t
+        WHERE
+            t.person_id = #{personId}
+          AND t.create_date &lt; now( )
+          AND t.expire_date &gt; now( )
+          AND t.`status` = 1
+    </select>
 </mapper>

src/main/resources/mapper/TaShopAccountMapper.xml

@@ -1,5 +1,20 @@
 <?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.TaShopAccountMapper">
+    <update id="updateCommission">
+        UPDATE ta_shop_account
+        SET amounts = amounts + ${amount},
+            brokerage_charges = brokerage_charges + ${amount}
+        WHERE
+            account_id = #{accountId}
+    </update>
 
+    <select id="selectByShop" resultType="com.yunzhi.shigongli.entity.TaShopAccount">
+        SELECT
+            *
+        FROM
+            ta_shop_account
+        WHERE
+            shop_id = #{shopId}
+    </select>
 </mapper>