feats

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

@@ -6,4 +6,26 @@ public class Constants {
     public final static Integer STATUS_READY = 0;
     public final static Integer STATUS_NORMAL = 1;
 
+    // 订单状态
+    public final static Integer ORDER_READY = 0;    // 未支付
+    public final static Integer ORDER_PAYED = 1;    // 已支付
+    public final static Integer ORDER_REFUND = 2;   // 已退款
+    public final static Integer ORDER_CANCEL = 9;   // 已取消
+
+    // 支付结果
+    public final static Integer PAY_SUCCESS = 1;
+    public final static Integer PAY_FAIL = 0;
+
+    // 抽成分类
+    public final static String COMMISSION_TRAFFIC = "traffic";  // 引流抽成
+    public final static String COMMISSION_PLATFORM = "platform";  // 平台抽成
+
+    // 账户流水
+    public final static Integer ACCOUNT_INCOME = 1;     // 收入
+    public final static Integer ACCOUNT_EXPENSE = -1;   // 支出
+
+    // 系统模块
+    public final static String TARGET_ORDER = "order";  // 订单
+    public final static String TARGET_HOTEL = "hotel";  // 民宿
+    public final static String TARGET_SHOP = "shop";    // 商铺
 }

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

@@ -14,4 +14,9 @@ public class DateUtils {
         Duration duration = Duration.between(dt1, dt2);
         return duration.toDays();
     }
+
+    public static String toString(LocalDateTime dt, String formater) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(formater);
+        return dt.format(formatter);
+    }
 }

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

@@ -0,0 +1,74 @@
+package com.yunzhi.shigongli.common;
+
+import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
+import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
+import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
+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.TaPerson;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+@Component
+public class WxPayUtils {
+    @Autowired
+    WeixinConfig config;
+
+    @Autowired
+    WxUtils wxUtils;
+
+    /**
+     * 下单
+     * @param person
+     * @param taOrder
+     * @return
+     * @throws Exception
+     */
+    public WxPayMpOrderResult createOrder(TaPerson person, TaOrder taOrder) 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.setOpenid(person.getOpenid());
+        orderRequest.setNotifyUrl(config.getPay().getNotifyUrl());
+        orderRequest.setSpbillCreateIp("218.91.253.51");  // 随便写个 IP
+        orderRequest.setTimeStart(DateUtils.toString(now, "yyyyMMddHHmmss"));
+        // 默认支付 30 分钟有效期
+        orderRequest.setTimeExpire(DateUtils.toString(now.plusMinutes(30), "yyyyMMddHHmmss"));
+
+        WxPayMpOrderResult payResult = payService.createOrder(orderRequest);
+        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;
+    }
+}

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

@@ -4,6 +4,7 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import com.github.binarywang.wxpay.config.WxPayConfig;
+import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
 import com.yunzhi.shigongli.config.WeixinConfig;
@@ -41,7 +42,8 @@ public class WxUtils {
         payConfig.setSubAppId(config.getPay().getSubAppId());
         payConfig.setSubMchId(config.getPay().getSubMchId());
         payConfig.setKeyPath(config.getPay().getKeyPath());
-
+        // 固定小程序支付
+        payConfig.setTradeType(WxPayConstants.TradeType.JSAPI);
         // 可以指定是否使用沙箱环境
         payConfig.setUseSandboxEnv(false);
 

src/main/java/com/yunzhi/shigongli/config/WeixinConfig.java

@@ -54,5 +54,15 @@ public class WeixinConfig {
          * apiclient_cert.p12文件的绝对路径，或者如果放在项目中，请以classpath:开头指定
          */
         private String keyPath;
+
+        /**
+         * 异步支付回调通知地址
+         */
+        private String notifyUrl;
+
+        /**
+         * 退款回调通知
+         */
+        private String refundNotifyUrl;
     }
 }

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

@@ -4,6 +4,7 @@ import com.yunzhi.shigongli.common.BaseController;
 import com.yunzhi.shigongli.common.OSSUtils;
 import com.yunzhi.shigongli.common.ResponseBean;
 import com.yunzhi.shigongli.config.AliyunConfig;
+import com.yunzhi.shigongli.service.ITaOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +27,11 @@ public class CommController extends BaseController {
     @Autowired
     AliyunConfig aliyunConfig;
 
+
+    @Autowired
+    ITaOrderService taOrderService;
+
+
     /**
      * 图片
      * @param multipartFile
@@ -68,4 +74,5 @@ public class CommController extends BaseController {
     private String getMonth() {
         return DateTimeFormatter.ofPattern("yyyy-MM").format(LocalDateTime.now());
     }
+
 }

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

@@ -82,7 +82,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 Integer id) throws Exception{
+    public ResponseBean taHotelDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         if(iTaHotelService.removeById(id)){
             return ResponseBean.success("success");
         }else {
@@ -98,7 +98,7 @@ public class TaHotelController extends BaseController {
      */
     @RequestMapping(value="/admin/taHotel/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taHotelUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean taHotelUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaHotel taHotel) throws Exception{
 
         if (iTaHotelService.updateById(taHotel)){
@@ -114,7 +114,7 @@ public class TaHotelController extends BaseController {
      */
     @RequestMapping(value="/admin/taHotel/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taHotelGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taHotelGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaHotelService.getById(id));
     }
 }

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

@@ -3,8 +3,11 @@ 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.ResponseBean;
+import com.yunzhi.shigongli.entity.TaPerson;
+import com.yunzhi.shigongli.vo.OrderItem;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +23,8 @@ import com.yunzhi.shigongli.service.ITaOrderService;
 import com.yunzhi.shigongli.entity.TaOrder;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 订单表 前端控制器
@@ -60,19 +65,48 @@ public class TaOrderController extends BaseController {
 //    }
 
     /**
-     * 保存对象
-     * @param taOrder 实体对象
+     * 小程序下单
+     * @param orderItems
+     * @param request
      * @return
+     * @throws Exception
      */
-    @RequestMapping(value="/wx/taOrder",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taOrderAdd(@ApiParam("保存内容") @RequestBody TaOrder taOrder) throws Exception{
+    @RequestMapping(value="/wx/order",method= RequestMethod.POST)
+    @ApiOperation(value="生成订单", notes = "生成订单", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taOrderAdd(@ApiParam("订单内容") @RequestBody OrderItem[] orderItems,
+                                   HttpServletRequest request) throws Exception{
+        if (null == orderItems|| orderItems.length < 1) {
+            return ResponseBean.error("未找到订单内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
 
-        if (iTaOrderService.save(taOrder)){
-            return ResponseBean.success(taOrder);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        TaPerson person = getCurrentPerson();
+        WxPayMpOrderResult result = iTaOrderService.order(person, orderItems);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 取消订单
+     * @param id
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/wx/order/{id}",method= RequestMethod.POST)
+    @ApiOperation(value="生成订单", notes = "生成订单", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taOrderDelete(@ApiParam("订单ID") @PathVariable String id,
+                                   HttpServletRequest request) throws Exception{
+        TaOrder taOrder = iTaOrderService.getById(id);
+        if (null == taOrder) {
+            return ResponseBean.error("订单不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
+
+        TaPerson taPerson = getCurrentPerson();
+        if (!taPerson.getPersonId().equals(taOrder.getPersonId())) {
+            return ResponseBean.error("您无权取消当前订单", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        iTaOrderService.cancelOrder(taOrder, taPerson);
+        return ResponseBean.success("取消成功");
     }
 
 //    /**

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

@@ -84,7 +84,7 @@ public class TaRoomController extends BaseController {
     @RequestMapping(value="/{plat}//taRoom/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean taRoomDelete(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
-                                     @ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+                                     @ApiParam("对象ID") @PathVariable String id) throws Exception{
         if(iTaRoomService.removeById(id)){
             return ResponseBean.success("success");
         }else {
@@ -101,7 +101,7 @@ public class TaRoomController extends BaseController {
     @RequestMapping(value="/{plat}/taRoom/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean taRoomUpdate(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
-                                     @ApiParam("对象ID") @PathVariable Integer id,
+                                     @ApiParam("对象ID") @PathVariable String id,
                                      @ApiParam("更新内容") @RequestBody TaRoom taRoom) throws Exception{
 
         if (iTaRoomService.updateById(taRoom)){
@@ -118,7 +118,7 @@ public class TaRoomController extends BaseController {
     @RequestMapping(value="/{plat}/taRoom/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taRoomGet(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
-                                  @ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+                                  @ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaRoomService.getById(id));
     }
 }

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

@@ -0,0 +1,114 @@
+package com.yunzhi.shigongli.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.shigongli.common.BaseController;
+import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.entity.TaShopWorker;
+import com.yunzhi.shigongli.service.ITaShopWorkerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 民宿员工 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+
+@Api(tags = "商铺员工")
+@RestController
+@RequestMapping("/")
+public class TaShopWorkerController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaShopWorkerController.class);
+
+    @Autowired
+    public ITaShopWorkerService iTaShopWorkerService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taShopWorker",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taShopWorkerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+
+		    IPage<TaShopWorker> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaShopWorker> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaShopWorker> result = iTaShopWorkerService.page(pg, queryWrapper);
+            return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taShopWorker 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taShopWorker",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taShopWorkerAdd(@ApiParam("保存内容") @RequestBody TaShopWorker taShopWorker) throws Exception{
+
+        if (iTaShopWorkerService.save(taShopWorker)){
+            return ResponseBean.success(taShopWorker);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/taShopWorker/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taShopWorkerDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        if(iTaShopWorkerService.removeById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taShopWorker 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taShopWorker/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taShopWorkerUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+                                        @ApiParam("更新内容") @RequestBody TaShopWorker taShopWorker) throws Exception{
+
+        if (iTaShopWorkerService.updateById(taShopWorker)){
+            return ResponseBean.success(iTaShopWorkerService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/taShopWorker/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taShopWorkerGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        return ResponseBean.success(iTaShopWorkerService.getById(id));
+    }
+}

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

@@ -0,0 +1,50 @@
+package com.yunzhi.shigongli.controller;
+
+import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
+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.WxUtils;
+import com.yunzhi.shigongli.service.ITaOrderPayService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "微信小程序")
+@RestController
+@RequestMapping("/wxpay")
+public class WxPayController  extends BaseController {
+
+    @Autowired
+    WxUtils wxUtils;
+
+    @Autowired
+    ITaOrderPayService orderPayService;
+
+    @ResponseBody
+    @RequestMapping("/notify/order")
+    public String payNotify(@RequestBody String xmlData) throws Exception {
+        WxPayService payService = wxUtils.getPayService();
+        final WxPayOrderNotifyResult result = payService.parseOrderNotifyResult(xmlData);
+
+        orderPayService.notifyOrder(result);
+
+        return WxPayNotifyResponse.success("成功");
+    }
+
+    @ResponseBody
+    @RequestMapping("/notify/refund")
+    public String refundNotify(@RequestBody String xmlData) throws Exception {
+        WxPayService payService = wxUtils.getPayService();
+        final WxPayRefundNotifyResult result = payService.parseRefundNotifyResult(xmlData);
+
+        orderPayService.refundNotifyOrder(result);
+
+        return WxPayNotifyResponse.success("成功");
+    }
+
+}

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

@@ -34,16 +34,15 @@ public class TaHotelAccount implements Serializable {
     @ApiModelProperty(value = "民宿ID")
     private String hotelId;
 
-    @ApiModelProperty(value = "总金额")
-    private BigDecimal amounts;
+    @ApiModelProperty(value = "总金额;单位分")
+    private Integer amounts;
 
-    @ApiModelProperty(value = "佣金")
-    private BigDecimal brokerageCharges;
+    @ApiModelProperty(value = "佣金;单位分")
+    private Integer brokerageCharges;
 
-    @ApiModelProperty(value = "已结佣金")
-    private BigDecimal paidCharges;
+    @ApiModelProperty(value = "已结佣金;单位分")
+    private Integer paidCharges;
 
     private LocalDateTime createDate;
 
-
 }

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

@@ -43,8 +43,8 @@ public class TaHotelAccountLog implements Serializable {
     @ApiModelProperty(value = "金额类型")
     private String amountType;
 
-    @ApiModelProperty(value = "金额")
-    private BigDecimal amount;
+    @ApiModelProperty(value = "金额;单位分")
+    private Integer amount;
 
     @ApiModelProperty(value = "关联类型")
     private String targetType;

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

@@ -30,6 +30,9 @@ public class TaHotelWorker implements Serializable {
     @TableId(value = "worker_id", type = IdType.UUID)
     private String workerId;
 
+    @ApiModelProperty(value = "民宿ID")
+    private String hotelId;
+
     @ApiModelProperty(value = "名称")
     private String workerName;
 

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

@@ -27,20 +27,29 @@ public class TaOrder implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "订单ID;订单号")
     @TableId(value = "order_id", type = IdType.INPUT)
     private String orderId;
 
+    @ApiModelProperty(value = "订单描述")
+    private String description;
+
+    @ApiModelProperty(value = "订单类型")
     private String orderType;
 
+    @ApiModelProperty(value = "人员ID")
     private String personId;
 
+    @ApiModelProperty(value = "攻略ID")
     private String strategyId;
 
-    private BigDecimal charges;
+    @ApiModelProperty(value = "金额")
+    private Integer charges;
 
+    @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-
 }

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

@@ -40,11 +40,11 @@ public class TaOrderCommission implements Serializable {
     @ApiModelProperty(value = "抽成类型")
     private String commissionType;
 
-    @ApiModelProperty(value = "抽成比例")
-    private BigDecimal commissionRate;
+    @ApiModelProperty(value = "抽成比例;单位千分之一")
+    private Integer commissionRate;
 
-    @ApiModelProperty(value = "抽成金额")
-    private BigDecimal charge;
+    @ApiModelProperty(value = "抽成金额;单位分")
+    private Integer charge;
 
     @ApiModelProperty(value = "时间")
     private LocalDateTime createDate;

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

@@ -44,13 +44,13 @@ public class TaOrderPay implements Serializable {
     private String payType;
 
     @ApiModelProperty(value = "是否退款")
-    private Integer isRefund;
+    private Boolean isRefund;
 
-    @ApiModelProperty(value = "prepay_id")
-    private String prepayId;
+    @ApiModelProperty(value = "支付结果描述")
+    private String message;
 
-    @ApiModelProperty(value = "支付金额")
-    private BigDecimal charges;
+    @ApiModelProperty(value = "支付金额;单位分")
+    private Integer charges;
 
     @ApiModelProperty(value = "状态")
     private Integer status;

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

@@ -28,7 +28,7 @@ public class TaOrderSub implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "子订单ID")
-    @TableId(value = "sub_order_id", type = IdType.UUID)
+    @TableId(value = "sub_order_id", type = IdType.INPUT)
     private String subOrderId;
 
     @ApiModelProperty(value = "主订单ID")
@@ -40,23 +40,23 @@ public class TaOrderSub implements Serializable {
     @ApiModelProperty(value = "套餐ID")
     private String packageId;
 
-    @ApiModelProperty(value = "总金额")
-    private BigDecimal charges;
+    @ApiModelProperty(value = "总金额;单位分")
+    private Integer charges;
 
     @ApiModelProperty(value = "数量")
     private Integer amount;
 
-    @ApiModelProperty(value = "单价")
-    private BigDecimal unitPrice;
+    @ApiModelProperty(value = "单价;单位分")
+    private Integer unitPrice;
 
-    @ApiModelProperty(value = "抽成")
-    private BigDecimal commissionCharge;
+    @ApiModelProperty(value = "抽成;单位分")
+    private Integer commissionCharge;
 
-    @ApiModelProperty(value = "返现金额")
-    private BigDecimal cashback;
+    @ApiModelProperty(value = "返现金额;单位分")
+    private Integer cashback;
 
     @ApiModelProperty(value = "是否核销")
-    private Integer isVerified;
+    private Boolean isVerified;
 
     @ApiModelProperty(value = "状态")
     private Integer status;

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

@@ -34,16 +34,15 @@ public class TaPersonAccount implements Serializable {
     @ApiModelProperty(value = "民宿ID")
     private String personId;
 
-    @ApiModelProperty(value = "总金额")
-    private BigDecimal amounts;
+    @ApiModelProperty(value = "总金额;单位分")
+    private Integer amounts;
 
-    @ApiModelProperty(value = "返现总金额")
-    private BigDecimal cashbackCharges;
+    @ApiModelProperty(value = "返现总金额;单位分")
+    private Integer cashbackCharges;
 
-    @ApiModelProperty(value = "消费总金额")
-    private BigDecimal paidCharges;
+    @ApiModelProperty(value = "消费总金额;单位分")
+    private Integer paidCharges;
 
     private LocalDateTime createDate;
 
-
 }

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

@@ -43,8 +43,8 @@ public class TaPersonAccountLog implements Serializable {
     @ApiModelProperty(value = "金额类型")
     private String amountType;
 
-    @ApiModelProperty(value = "金额")
-    private BigDecimal amount;
+    @ApiModelProperty(value = "金额;单位分")
+    private Integer amount;
 
     @ApiModelProperty(value = "关联类型")
     private String targetType;

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

@@ -34,14 +34,14 @@ public class TaShopAccount implements Serializable {
     @ApiModelProperty(value = "民宿ID")
     private String shopId;
 
-    @ApiModelProperty(value = "总金额")
-    private BigDecimal amounts;
+    @ApiModelProperty(value = "总金额;单位分")
+    private Integer amounts;
 
-    @ApiModelProperty(value = "佣金")
-    private BigDecimal brokerageCharges;
+    @ApiModelProperty(value = "佣金;单位分")
+    private Integer brokerageCharges;
 
-    @ApiModelProperty(value = "已结佣金")
-    private BigDecimal paidCharges;
+    @ApiModelProperty(value = "已结佣金;单位分")
+    private Integer paidCharges;
 
     private LocalDateTime createDate;
 

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

@@ -43,8 +43,8 @@ public class TaShopAccountLog implements Serializable {
     @ApiModelProperty(value = "金额类型")
     private String amountType;
 
-    @ApiModelProperty(value = "金额")
-    private BigDecimal amount;
+    @ApiModelProperty(value = "金额;单位分")
+    private Integer amount;
 
     @ApiModelProperty(value = "关联类型")
     private String targetType;

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

@@ -46,14 +46,14 @@ public class TaShopPackage implements Serializable {
     @ApiModelProperty(value = "主图")
     private String poster;
 
-    @ApiModelProperty(value = "门市价格")
-    private BigDecimal standardPrice;
+    @ApiModelProperty(value = "门市价格,单位分")
+    private Integer standardPrice;
 
-    @ApiModelProperty(value = "实售价格")
-    private BigDecimal actualPrice;
+    @ApiModelProperty(value = "实售价格,单位分")
+    private Integer actualPrice;
 
-    @ApiModelProperty(value = "返现")
-    private BigDecimal cashback;
+    @ApiModelProperty(value = "返现,单位分")
+    private Integer cashback;
 
     @ApiModelProperty(value = "有效期始")
     private LocalDateTime startTime;

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

@@ -30,11 +30,11 @@ public class TaShopPackageSetting implements Serializable {
     @TableId(value = "package_id", type = IdType.INPUT)
     private String packageId;
 
-    @ApiModelProperty(value = "引流分成")
-    private BigDecimal trafficRate;
+    @ApiModelProperty(value = "引流分成;单位千分之一")
+    private Integer trafficRate;
 
-    @ApiModelProperty(value = "平台分成")
-    private BigDecimal platformRate;
+    @ApiModelProperty(value = "平台分成;单位千分之一")
+    private Integer platformRate;
 
     @ApiModelProperty(value = "参与攻略")
     private Integer isStrategy;

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

@@ -0,0 +1,56 @@
+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="TaShopWorker对象", description="商铺员工")
+public class TaShopWorker implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "员工ID")
+    @TableId(value = "worker_id", type = IdType.UUID)
+    private String workerId;
+
+    @ApiModelProperty(value = "商铺ID")
+    private String shopId;
+
+    @ApiModelProperty(value = "名称")
+    private String workerName;
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "关联人员")
+    private String personId;
+
+    @ApiModelProperty(value = "是否管理员")
+    private Integer isManager;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+
+}

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

@@ -0,0 +1,21 @@
+package com.yunzhi.shigongli.event;
+
+import com.yunzhi.shigongli.entity.TaOrder;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 支付成功事件
+ */
+public class PaySuccessEvent extends ApplicationEvent {
+
+    TaOrder taOrder;
+
+    public PaySuccessEvent(Object source, TaOrder taOrder) {
+        super(source);
+        this.taOrder = taOrder;
+    }
+
+    public TaOrder getTaOrder() {
+        return taOrder;
+    }
+}

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

@@ -0,0 +1,29 @@
+package com.yunzhi.shigongli.event;
+
+import com.yunzhi.shigongli.entity.TaOrder;
+import com.yunzhi.shigongli.entity.TaOrderSub;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 退款成功事件
+ */
+public class RefundSuccessEvent extends ApplicationEvent {
+
+    TaOrder taOrder;
+
+    TaOrderSub taOrderSub;
+
+    public RefundSuccessEvent(Object source, TaOrder taOrder, TaOrderSub taOrderSub) {
+        super(source);
+        this.taOrder = taOrder;
+        this.taOrderSub = taOrderSub;
+    }
+
+    public TaOrder getTaOrder() {
+        return taOrder;
+    }
+
+    public TaOrderSub getTaOrderSub() {
+        return taOrderSub;
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.yunzhi.shigongli.event.listener;
+
+import com.yunzhi.shigongli.event.PaySuccessEvent;
+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 PaySuccessEventListener implements ApplicationListener<PaySuccessEvent> {
+    @Autowired
+    ITaPersonAccountService personAccountService;
+
+    @Override
+    public void onApplicationEvent(PaySuccessEvent evt) {
+        try {
+
+            // 支付成功之后, 给个人返现
+            personAccountService.cashback(evt.getTaOrder());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

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

@@ -3,6 +3,7 @@ package com.yunzhi.shigongli.mapper;
 import com.yunzhi.shigongli.entity.TaOrder;
 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 TaOrderMapper extends BaseMapper<TaOrder> {
 
+    int updateStatus(@Param("orderId") String orderId, @Param("status") Integer status);
 }

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

@@ -3,6 +3,7 @@ package com.yunzhi.shigongli.mapper;
 import com.yunzhi.shigongli.entity.TaOrderPay;
 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 TaOrderPayMapper extends BaseMapper<TaOrderPay> {
 
+    TaOrderPay getByOrder(@Param("orderId") String orderId, @Param("subOrderId") String subOrderId);
 }

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

@@ -3,6 +3,9 @@ package com.yunzhi.shigongli.mapper;
 import com.yunzhi.shigongli.entity.TaOrderSub;
 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,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaOrderSubMapper extends BaseMapper<TaOrderSub> {
 
+    int updateStatusByOrder(@Param("orderId") String orderId, @Param("status") Integer status);
+
+    List<TaOrderSub> getListByOrder(@Param("orderId") String orderId);
 }

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

@@ -3,6 +3,7 @@ package com.yunzhi.shigongli.mapper;
 import com.yunzhi.shigongli.entity.TaPersonAccount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +16,8 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaPersonAccountMapper extends BaseMapper<TaPersonAccount> {
 
+    TaPersonAccount getByPerson(@Param("personId") String personId);
+
+    int updateCashBack(@Param("accountId") String accountId, @Param("cashback") Integer cashback);
+
 }

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

@@ -0,0 +1,18 @@
+package com.yunzhi.shigongli.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.entity.TaShopWorker;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 民宿员工 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Mapper
+public interface TaShopWorkerMapper extends BaseMapper<TaShopWorker> {
+
+}

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

@@ -1,5 +1,7 @@
 package com.yunzhi.shigongli.service;
 
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
 import com.yunzhi.shigongli.entity.TaOrderPay;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaOrderPayService extends IService<TaOrderPay> {
 
+    void notifyOrder(WxPayOrderNotifyResult notifyResult) throws Exception;
+
+    void refundNotifyOrder(WxPayRefundNotifyResult result) throws Exception;
 }

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

@@ -1,7 +1,11 @@
 package com.yunzhi.shigongli.service;
 
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 import com.yunzhi.shigongli.entity.TaOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.shigongli.entity.TaPerson;
+import com.yunzhi.shigongli.vo.OrderItem;
 
 /**
  * <p>
@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaOrderService extends IService<TaOrder> {
 
+    WxPayMpOrderResult order(TaPerson person, OrderItem[] orderItems) throws Exception;
+
+    void cancelOrder(TaOrder taOrder, TaPerson taPerson) throws Exception;
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.shigongli.service;
 
+import com.yunzhi.shigongli.entity.TaOrder;
 import com.yunzhi.shigongli.entity.TaPersonAccount;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,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/ITaShopWorkerService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.shigongli.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.shigongli.entity.TaShopWorker;
+
+/**
+ * <p>
+ * 民宿员工 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+public interface ITaShopWorkerService extends IService<TaShopWorker> {
+
+}

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

@@ -1,9 +1,21 @@
 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.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.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.service.ITaOrderPayService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +29,91 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaOrderPayServiceImpl extends ServiceImpl<TaOrderPayMapper, TaOrderPay> implements ITaOrderPayService {
 
+    @Autowired
+    TaOrderPayMapper orderPayMapper;
+
+    @Autowired
+    TaOrderMapper taOrderMapper;
+
+    @Autowired
+    TaOrderSubMapper taOrderSubMapper;
+
+    @Autowired
+    ApplicationEventPublisher eventPublisher;
+
+    /**
+     * 支付回调
+     * @param notifyResult
+     * @throws Exception
+     */
+    @Override
+    public void notifyOrder(WxPayOrderNotifyResult notifyResult) throws Exception {
+        TaOrder taOrder = taOrderMapper.selectById(notifyResult.getOutTradeNo());
+        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);
+        }
+
+        // 更新订单为已支付
+        if (isSuccess) {
+            taOrderMapper.updateStatus(taOrder.getOrderId(), Constants.ORDER_PAYED);
+            taOrderSubMapper.updateStatusByOrder(taOrder.getOrderId(), Constants.ORDER_PAYED);
+        }
+
+        // 支付成功, 发布返现事件
+        if (isSuccess) {
+            PaySuccessEvent evt = new PaySuccessEvent(this, taOrder);
+            eventPublisher.publishEvent(evt);
+        }
+    }
+
+    @Override
+    public void refundNotifyOrder(WxPayRefundNotifyResult result) throws Exception {
+        WxPayRefundNotifyResult.ReqInfo reqInfo = result.getReqInfo();
+        if (null == reqInfo) {
+            return;
+        }
+
+        // 退款成功
+        boolean isSuccess = WxPayConstants.RefundStatus.SUCCESS.equals(reqInfo.getRefundStatus());
+        if (!isSuccess) {
+            return;
+        }
+
+        // 此处不能更新订单状态
+        // 因为退款分2种情况, 1退款申请, 2订单取消
+
+        TaOrder taOrder = taOrderMapper.selectById(reqInfo.getOutTradeNo());
+
+        // 如果退款单号 = 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;
+        }
+
+
+    }
 }

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

@@ -1,10 +1,22 @@
 package com.yunzhi.shigongli.service.impl;
 
-import com.yunzhi.shigongli.entity.TaOrder;
-import com.yunzhi.shigongli.mapper.TaOrderMapper;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
+import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
+import com.github.binarywang.wxpay.constant.WxPayConstants;
+import com.yunzhi.shigongli.common.*;
+import com.yunzhi.shigongli.entity.*;
+import com.yunzhi.shigongli.mapper.*;
 import com.yunzhi.shigongli.service.ITaOrderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.shigongli.vo.OrderItem;
+import lombok.extern.slf4j.Slf4j;
+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>
@@ -14,7 +26,234 @@ import org.springframework.stereotype.Service;
  * @author yansen
  * @since 2021-08-17
  */
+@Slf4j
 @Service
 public class TaOrderServiceImpl extends ServiceImpl<TaOrderMapper, TaOrder> implements ITaOrderService {
 
+    @Autowired
+    WxPayUtils wxPayUtils;
+
+    @Autowired
+    TaShopPackageMapper taShopPackageMapper;
+
+    @Autowired
+    TaShopPackageSettingMapper packageSettingMapper;
+
+    @Autowired
+    TaOrderMapper taOrderMapper;
+
+    @Autowired
+    TaOrderSubMapper taOrderSubMapper;
+
+    @Autowired
+    TaOrderCommissionMapper commissionMapper;
+
+    @Autowired
+    TaOrderPayMapper orderPayMapper;
+
+    /**
+     * 下单支付
+     * @param person
+     * @param orderItems
+     * @return
+     * @throws Exception
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public WxPayMpOrderResult order(TaPerson person, OrderItem[] orderItems) throws Exception {
+        LocalDateTime now = LocalDateTime.now();
+
+        // 先生成主订单
+        TaOrder taOrder = new TaOrder();
+        taOrder.setOrderId(getOrderNo());
+        taOrder.setDescription("套餐");
+        taOrder.setPersonId(person.getPersonId());
+        // 默认未支付
+        taOrder.setStatus(Constants.ORDER_READY);
+        taOrder.setCreateDate(now);
+
+        // 子订单列表
+        Integer charge = createAndSaveOrderSubList(taOrder, orderItems);
+        taOrder.setCharges(charge);
+        save(taOrder);
+
+        // 发起微信支付订单
+        return wxPayUtils.createOrder(person, taOrder);
+    }
+
+    /**
+     * 取消订单
+     * @param taOrder
+     * @param taPerson
+     * @throws Exception
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void cancelOrder(TaOrder taOrder, TaPerson taPerson) throws Exception {
+        List<TaOrderSub> orderSubList = taOrderSubMapper.getListByOrder(taOrder.getOrderId());
+        if (null == orderSubList || orderSubList.size() < 1) {
+            throw new Exception("未找到订单详情");
+        }
+
+        // 如果有已核销的, 则不能取消
+        Object[] o1 = orderSubList.stream().filter(x -> x.getIsVerified()).toArray();
+        if (o1.length > 0) {
+            throw new Exception("订单存在已核销内容, 不能取消");
+        }
+
+        // 如果已支付, 则不能取消
+        if (Constants.ORDER_PAYED.equals(taOrder.getStatus())) {
+            throw new Exception("订单已支付, 请先申请退款");
+        }
+
+        // 只有未支付的, 或者已退款的可以取消
+        if (!Constants.ORDER_READY.equals(taOrder.getStatus())
+            && !Constants.ORDER_REFUND.equals(taOrder.getStatus())) {
+            log.error("退款订单【{}】, 状态为 {}", taOrder.getOrderId(), taOrder.getStatus());
+            throw new Exception("订单状态异常, 请联系相关人员");
+        }
+
+        // 只需要更新状态即可
+        taOrderMapper.updateStatus(taOrder.getOrderId(), Constants.ORDER_CANCEL);
+        taOrderSubMapper.updateStatusByOrder(taOrder.getOrderId(), Constants.ORDER_CANCEL);
+    }
+
+    /**
+     * 获取订单号
+     * @return
+     */
+    private String getOrderNo() {
+        LocalDateTime now = LocalDateTime.now();
+        String today = DateUtils.toString(now, "yyyyMMddHHmm");
+        String orderNo = null;
+        do {
+            String random = StringUtils.random(4);
+            orderNo = String.format("%s-%s", today, random);
+            TaOrder taOrder = getById(orderNo);
+            if (null == taOrder) {
+                break;
+            }
+        } while (true);
+
+        return orderNo;
+    }
+
+    /**
+     * 生成并保存子订单
+     * @param taOrder
+     * @param orderItems
+     * @return
+     * @throws Exception
+     */
+    private Integer createAndSaveOrderSubList(TaOrder taOrder, OrderItem[] orderItems) throws Exception {
+        LocalDateTime now = LocalDateTime.now();
+
+        Integer totalCharge = 0;
+        for (int i = 0; i < orderItems.length; i += 1) {
+            OrderItem item = orderItems[i];
+            String subOrderId = taOrder.getOrderId() + "-" + (i + 1);
+            TaOrderSub orderSub = new TaOrderSub();
+            orderSub.setSubOrderId(subOrderId);
+            orderSub.setOrderId(taOrder.getOrderId());
+            // 默认未核销
+            orderSub.setIsVerified(false);
+            // 未支付
+            orderSub.setStatus(Constants.ORDER_READY);
+            // 时间
+            orderSub.setCreateDate(now);
+
+            if (StringUtils.isEmpty(item.getItemId())) {
+                throw new Exception("订单中存在空的订单项");
+            }
+            if (null == item.getPrice() || item.getPrice() < 0) {
+                throw new Exception("订单中存在不正常的金额");
+            }
+            if (null == item.getAmount() || item.getAmount() < 0) {
+                throw new Exception("订单中存在不正常的数量");
+            }
+
+            // 套餐ID
+            String packageId = item.getItemId();
+            if (StringUtils.isEmpty(packageId)) {
+                throw new Exception("订单中存在空的订单项");
+            }
+
+            // 套餐
+            TaShopPackage shopPackage = taShopPackageMapper.selectById(packageId);
+            if (null == shopPackage || !Constants.STATUS_NORMAL.equals(shopPackage.getStatus())) {
+                throw new Exception("订单中存在异常状态套餐");
+            }
+            if (shopPackage.getCashback() >= shopPackage.getActualPrice()) {
+                throw new Exception("订单中存在异常套餐, 请联系管理员");
+            }
+
+            orderSub.setPackageId(packageId);
+
+            // 价格
+            if (!item.getPrice().equals(shopPackage.getActualPrice())) {
+                throw new Exception("订单中存在变化的价格, 请刷新重试");
+            }
+
+            orderSub.setUnitPrice(item.getPrice());
+            orderSub.setCharges(item.getPrice() * item.getAmount());
+            totalCharge += orderSub.getCharges();
+
+            // 数量
+            orderSub.setAmount(item.getAmount());
+
+            // 返现设置
+            orderSub.setCashback(shopPackage.getCashback());
+
+            // 套餐分成设置
+            TaShopPackageSetting packageSetting = packageSettingMapper.selectById(packageId);
+            if (null != packageSetting) {
+                // 引流分成
+                Integer trafficRate = packageSetting.getTrafficRate();
+                Integer trafficCommission = orderSub.getCharges() * (trafficRate / 1000);
+                // 平台分成
+                Integer platformRate = packageSetting.getPlatformRate();
+                Integer platformCommission = orderSub.getCharges() * (platformRate / 1000);
+                // 总提成
+                Integer commissionCharge = trafficCommission + platformCommission;
+                if (commissionCharge + orderSub.getCashback() >= orderSub.getCharges()) {
+                    log.error("下单失败; 套餐[{}]抽成与返现设置有问题", packageId);
+                    throw new Exception("订单中存在异常套餐, 请联系相关人员");
+                }
+
+                if (trafficCommission > 0) {
+                    createAndSaveOrderCommission(orderSub, trafficCommission, Constants.COMMISSION_TRAFFIC);
+                }
+
+                if (platformCommission > 0) {
+                    createAndSaveOrderCommission(orderSub, trafficCommission, Constants.COMMISSION_PLATFORM);
+                }
+
+                orderSub.setCommissionCharge(commissionCharge);
+            } else {
+                orderSub.setCommissionCharge(0);
+            }
+
+            taOrderSubMapper.insert(orderSub);
+        }
+
+        return totalCharge;
+    }
+
+    /**
+     * 生成并保存抽成表
+     * @param orderSub
+     * @param charge
+     * @param commissionType
+     * @throws Exception
+     */
+    private void createAndSaveOrderCommission(TaOrderSub orderSub, Integer charge, String commissionType) throws Exception {
+        LocalDateTime now = LocalDateTime.now();
+        TaOrderCommission orderCommission = new TaOrderCommission();
+        orderCommission.setOrderId(orderSub.getOrderId());
+        orderCommission.setSubOrderId(orderSub.getSubOrderId());
+        orderCommission.setCommissionType(commissionType);
+        orderCommission.setCharge(charge);
+        orderCommission.setCreateDate(now);
+        commissionMapper.insert(orderCommission);
+    }
 }

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

@@ -1,10 +1,22 @@
 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.mapper.TaOrderSubMapper;
+import com.yunzhi.shigongli.mapper.TaPersonAccountLogMapper;
 import com.yunzhi.shigongli.mapper.TaPersonAccountMapper;
 import com.yunzhi.shigongli.service.ITaPersonAccountService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,7 +26,44 @@ import org.springframework.stereotype.Service;
  * @author yansen
  * @since 2021-08-17
  */
+@Slf4j
 @Service
 public class TaPersonAccountServiceImpl extends ServiceImpl<TaPersonAccountMapper, TaPersonAccount> implements ITaPersonAccountService {
 
+    @Autowired
+    TaOrderSubMapper orderSubMapper;
+
+    @Autowired
+    TaPersonAccountMapper personAccountMapper;
+
+    @Autowired
+    TaPersonAccountMapper accountMapper;
+
+    @Autowired
+    TaPersonAccountLogMapper accountLogMapper;
+
+    @Async
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void cashback(TaOrder taOrder) throws Exception {
+        List<TaOrderSub> orderSubList = orderSubMapper.getListByOrder(taOrder.getOrderId());
+
+        Integer cashback = 0;
+        for(TaOrderSub item : orderSubList) {
+            cashback += item.getCashback();
+        }
+
+        TaPersonAccount personAccount = personAccountMapper.getByPerson(taOrder.getPersonId());
+        accountMapper.updateCashBack(personAccount.getAccountId(), cashback);
+
+        TaPersonAccountLog accountLog = new TaPersonAccountLog();
+        accountLog.setAccountId(personAccount.getAccountId());
+        accountLog.setPersonId(taOrder.getPersonId());
+        accountLog.setAmount(cashback);
+        accountLog.setSignType(Constants.ACCOUNT_INCOME);
+        accountLog.setTargetType(Constants.TARGET_ORDER);
+        accountLog.setTargetId(taOrder.getOrderId());
+        accountLog.setOrderId(taOrder.getOrderId());
+        accountLogMapper.insert(accountLog);
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.yunzhi.shigongli.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.shigongli.entity.TaShopWorker;
+import com.yunzhi.shigongli.mapper.TaShopWorkerMapper;
+import com.yunzhi.shigongli.service.ITaShopWorkerService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 民宿员工 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-08-17
+ */
+@Service
+public class TaShopWorkerServiceImpl extends ServiceImpl<TaShopWorkerMapper, TaShopWorker> implements ITaShopWorkerService {
+
+}

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

@@ -0,0 +1,19 @@
+package com.yunzhi.shigongli.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "订单内容")
+@Data
+public class OrderItem {
+    @ApiModelProperty("订单项目ID/套餐ID")
+    String itemId;
+
+    @ApiModelProperty("价格")
+    Integer price;
+
+    @ApiModelProperty("数量")
+    Integer amount;
+}

src/main/resources/application.yml

@@ -13,6 +13,7 @@ interceptor:
       - /admin/login
       - /admin/logout
       - /ma/login
+      - /wxpay/notify/order
       - /swagger-ui/**
       - /swagger-resources/**
       - /v2/**
@@ -57,6 +58,8 @@ weixin:
     subAppId:
     subMchId:
     keyPath: /yunpan/shigongli/cert/apiclient_cert.p12
+    notifyUrl: https://sgl.njyunzhi.com/api/wxpay/notify/order
+    refundNotifyUrl: https://sgl.njyunzhi.com/api/wxpay/notify/refund
 
 ###
 spring:

src/main/resources/mapper/TaOrderMapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaOrderMapper">
 
+    <update id="updateStatus">
+        UPDATE ta_order
+        SET `status` = #{status}
+        WHERE
+            order_id = #{orderId}
+    </update>
 </mapper>

src/main/resources/mapper/TaOrderPayMapper.xml

@@ -2,4 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaOrderPayMapper">
 
+    <select id="getByOrder" resultType="com.yunzhi.shigongli.entity.TaOrderPay">
+        SELECT
+            *
+        FROM
+            ta_order_pay t
+        WHERE
+            t.order_id = #{orderId}
+          <if test="subOrderId != null and subOrderId != ''">
+              AND t.sub_order_id = #{subOrderId}
+          </if>
+          <if test="subOrderId == null or subOrderId == ''">
+              AND (t.sub_order_id IS NULL OR t.sub_order_id = '')
+          </if>
+            AND is_refund = 0
+    </select>
 </mapper>

src/main/resources/mapper/TaOrderSubMapper.xml

@@ -2,4 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaOrderSubMapper">
 
+    <update id="updateStatusByOrder">
+        UPDATE ta_order_sub
+        SET `status` = #{status}
+        WHERE
+            order_id = #{orderId}
+    </update>
+    <select id="getListByOrder" resultType="com.yunzhi.shigongli.entity.TaOrderSub">
+        SELECT * FROM ta_order_sub
+        WHERE
+            order_id = #{orderId}
+            AND `status` &gt; -1
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonAccountMapper.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.TaPersonAccountMapper">
+    <update id="updateCashBack">
+        UPDATE ta_person_account t
+        SET t.amounts = t.amounts + ${cashback},
+            t.cashback_charges = t.cashback_charges + ${cashback}
+        WHERE
+            t.account_id = #{accountId}
+    </update>
 
+    <select id="getByPerson" resultType="com.yunzhi.shigongli.entity.TaPersonAccount">
+        SELECT
+            *
+        FROM
+            ta_person_account
+        WHERE
+            person_id = #{personId}
+    </select>
 </mapper>

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