feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>shigongli</artifactId>
-	<version>2.0.0</version>
+	<version>2.0.1</version>
 	<name>shigongli</name>
 	<description>Shi Gong Li</description>
 

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

@@ -72,4 +72,6 @@ public class Constants {
     // 小程序消息模板
     public final static String TPL_MESSAGE_HOTEL_CHECK_IN = "hotel_check_in";       // 民宿入住消息
     public final static String TPL_MESSAGE_HOTEL_CHECK_OUT = "hotel_check_out";     // 民宿离店消息
+    public final static String TPL_MESSAGE_SHOP_PAY_SUCCESS = "shop_pay_success";   // 商铺下单成功通知
+    public final static String TPL_MESSAGE_SHOP_VERIFY_RESULT = "shop_verify_result";   // 商铺下单成功通知
 }

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

@@ -3,6 +3,7 @@ package com.yunzhi.shigongli.common;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
 import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor;
+import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.constant.WxPayConstants;
@@ -10,9 +11,15 @@ import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
 import com.yunzhi.shigongli.config.WeixinConfig;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
+@Slf4j
 @Component
 public class WxUtils {
     private static WxMaService service;
@@ -69,4 +76,33 @@ public class WxUtils {
         private WxMaCodeLineColor lineColor;
         private boolean isHyaline;
     }
+
+    /**
+     * 发送订阅消息
+     * @param templateId
+     * @param openid
+     * @param page
+     * @param dataList
+     * @throws Exception
+     */
+    @Async
+    public void sendMessage(String templateId, String openid, String page, List<WxMaSubscribeMessage.Data> dataList) throws Exception {
+        WxMaSubscribeMessage wxMaSubscribeMessage = WxMaSubscribeMessage
+                .builder()
+                .templateId(templateId)
+                .toUser(openid)
+                .page(page)
+                .data(dataList)
+                .build();
+
+        try {
+            service.getMsgService().sendSubscribeMsg(wxMaSubscribeMessage);
+        } catch (Exception e) {
+            e.printStackTrace();
+
+            // 再发送一次
+            Thread.sleep(1000);
+            service.getMsgService().sendSubscribeMsg(wxMaSubscribeMessage);
+        }
+    }
 }

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

@@ -138,7 +138,7 @@ public class TaOrderController extends BaseController {
     public ResponseBean taOrderDelete(@ApiParam("订单ID") @PathVariable String id,
                                    HttpServletRequest request) throws Exception{
         TaOrder taOrder = iTaOrderService.getById(id);
-        if (null == taOrder || Constants.STATUS_DELETED != taOrder.getStatus()) {
+        if (null == taOrder || Constants.STATUS_DELETED == taOrder.getStatus()) {
             return ResponseBean.error("订单不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 

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

@@ -23,6 +23,7 @@ import com.yunzhi.shigongli.entity.TaRoom;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -94,6 +95,8 @@ public class TaRoomController extends BaseController {
     public ResponseBean taRoomAdd(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
                                   @ApiParam("保存内容") @RequestBody TaRoom taRoom) throws Exception{
 
+        taRoom.setCreateDate(LocalDateTime.now());
+
         if (iTaRoomService.save(taRoom)){
             return ResponseBean.success(taRoom);
         }else {

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

@@ -164,6 +164,7 @@ public class TaShopController extends BaseController {
             ResourceFieldVO resourceVO = iTaShopService.copyProperties(taShop);
             TaResource taResource = taResourceService.getByTarget(Constants.TARGET_SHOP, id);
             BeanUtils.copyProperties(resourceVO, taResource);
+            taResource.setTargetName(taShop.getShopName());
 
             taResourceService.updateById(taResource);
             return ResponseBean.success(iTaShopService.getById(id));
@@ -304,10 +305,10 @@ public class TaShopController extends BaseController {
             return ResponseBean.error("请先进行人员身份绑定", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
-        // 获取所有的民宿信息
+        // 获取所有的商铺信息
         List<TaShop> shopList = iTaShopService.getListByPerson(taPerson);
         if (null == shopList || shopList.size() < 1) {
-            return ResponseBean.error("数据异常, 未找到关联民宿", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("数据异常, 未找到关联商铺", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         Map<String, Object> result = new HashMap<>();

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

@@ -160,6 +160,7 @@ public class TaTouristController extends BaseController {
             ResourceFieldVO resourceVO = iTaTouristService.copyProperties(taTourist);
             TaResource taResource = taResourceService.getByTarget(Constants.TARGET_TOURIST, id);
             BeanUtils.copyProperties(resourceVO, taResource);
+            taResource.setTargetName(taTourist.getTouristName());
             taResourceService.updateById(taResource);
 
             return ResponseBean.success(iTaTouristService.getById(id));

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

@@ -8,6 +8,7 @@ import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
 import com.yunzhi.shigongli.common.StringUtils;
 import com.yunzhi.shigongli.entity.*;
+import com.yunzhi.shigongli.event.VerifyResultEvent;
 import com.yunzhi.shigongli.service.*;
 import com.yunzhi.shigongli.vo.VerifyTargetVO;
 import io.swagger.annotations.Api;
@@ -16,6 +17,7 @@ import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
@@ -49,6 +51,9 @@ public class TaVerifyTargetController extends BaseController {
     @Autowired
     public ITaShopWorkerService shopWorkerService;
 
+    @Autowired
+    ApplicationEventPublisher eventPublisher;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -117,6 +122,9 @@ public class TaVerifyTargetController extends BaseController {
             iTaOrderSubService.validation(taPerson, taOrder, taOrderSub);
         }
 
+        //
+        eventPublisher.publishEvent(new VerifyResultEvent(this, taVerifyTarget));
+
         return ResponseBean.success("核销成功");
     }
 

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

@@ -52,11 +52,13 @@ public class TdCityController extends BaseController {
     public ResponseBean tdCityList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                    @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                    @ApiParam("父级分类") @RequestParam(value ="areaPId", required = false) String areaPId,
+                                   @ApiParam("等级") @RequestParam(value ="areaLevel", defaultValue = "3") String areaLevel,
                                    @ApiParam("名称") @RequestParam(value ="areaName", required = false) String areaName) throws Exception{
 
         IPage<TdCity> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TdCity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(!StringUtils.isEmpty(areaPId),"area_p_id", areaPId);
+        queryWrapper.eq(!StringUtils.isEmpty(areaLevel),"area_level", areaLevel);
         queryWrapper.like(!StringUtils.isEmpty(areaName), "area_name","%"+areaName+"%");
         queryWrapper.orderByAsc("area_id");
 

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

@@ -38,6 +38,9 @@ public class TaResource implements Serializable {
     @ApiModelProperty(value = "访问对象ID")
     private String targetId;
 
+    @ApiModelProperty(value = "访问对象ID")
+    private String targetName;
+
     @ApiModelProperty(value = "点赞数")
     private Integer likeNum;
 

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

@@ -42,12 +42,18 @@ public class TaRoom implements Serializable {
     @ApiModelProperty(value = "定位")
     private String location;
 
+    @ApiModelProperty(value = "位置名称")
+    private String locName;
+
     @ApiModelProperty(value = "地址")
     private String address;
 
     @ApiModelProperty(value = "停车场定位")
     private String parkingLocation;
 
+    @ApiModelProperty(value = "停车场定位")
+    private String pkLocName;
+
     @ApiModelProperty(value = "停车场位置")
     private String parkingAddress;
 

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

@@ -74,6 +74,9 @@ public class TaShop implements Serializable {
     @ApiModelProperty(value = "服务评分")
     private BigDecimal serviceScore;
 
+    @ApiModelProperty(value = "权重")
+    private Integer weight;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 

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

@@ -42,8 +42,11 @@ public class TaShopPackage implements Serializable {
     @ApiModelProperty(value = "描述")
     private String description;
 
-    @ApiModelProperty(value = "适用人数")
-    private Integer personNum;
+    @ApiModelProperty(value = "适用最少人数")
+    private Integer minPerson;
+
+    @ApiModelProperty(value = "适用最多人数")
+    private Integer maxPerson;
 
     @ApiModelProperty(value = "主图")
     private String poster;

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

@@ -52,6 +52,9 @@ public class TaVerifyTarget implements Serializable {
     @ApiModelProperty(value = "返现金额/单位分")
     private Integer cashback;
 
+    @ApiModelProperty(value = "抽成金额/单位分")
+    private Integer commissionCharge;
+
     @ApiModelProperty(value = "发放时间")
     private LocalDateTime createDate;
 

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

@@ -41,7 +41,7 @@ public class TrPersonClick implements Serializable {
     private String eventType;
 
     @ApiModelProperty(value = "内容对象")
-    private Integer eventParams;
+    private String eventParams;
 
     @ApiModelProperty(value = "创建日期")
     private LocalDateTime createDate;

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

@@ -1,7 +1,6 @@
 package com.yunzhi.shigongli.event;
 
 
-import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.DateUtils;
@@ -10,7 +9,6 @@ import com.yunzhi.shigongli.entity.TaMiniappMessageTpl;
 import com.yunzhi.shigongli.mapper.TaMiniappMessageTplMapper;
 import com.yunzhi.shigongli.service.ITaRoomOrderService;
 import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -54,8 +52,8 @@ public class SendMessageTask {
             return ;
         }
 
+        String templateId = messageTpl.getTemplateId();
         String remark = "请记得带好您的随身物品";
-        WxMaService maService = wxUtils.getService();
 
         for (Map<String, Object> item : list) {
             List<WxMaSubscribeMessage.Data> dataList = new ArrayList<>();
@@ -66,22 +64,17 @@ public class SendMessageTask {
             String hotelId = item.get("hotelId").toString();
             String page = messageTpl.getPage() + "&id=" + hotelId;
 
-            WxMaSubscribeMessage wxMaSubscribeMessage = WxMaSubscribeMessage
-                    .builder()
-                    .templateId(messageTpl.getTemplateId())
-                    .toUser(openid)
-                    .page(page)
-                    .data(dataList)
-                    .build();
-
             try {
-                maService.getMsgService().sendSubscribeMsg(wxMaSubscribeMessage);
-                Thread.sleep(1000);
-            } catch (WxErrorException e) {
-                log.error("发送退房消息失败: {}", e.getMessage());
-                e.printStackTrace();
-            } catch (InterruptedException e) {
+                wxUtils.sendMessage(templateId, openid, page, dataList);
+            } catch (Exception e) {
                 e.printStackTrace();
+                log.error("发送离店消息给游客失败: {}", e.getMessage());
+            } finally {
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
             }
         }
 

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

@@ -0,0 +1,21 @@
+package com.yunzhi.shigongli.event;
+
+import com.yunzhi.shigongli.entity.TaVerifyTarget;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 核销结果
+ */
+public class VerifyResultEvent extends ApplicationEvent {
+
+    TaVerifyTarget taVerifyTarget;
+
+    public VerifyResultEvent(Object source, TaVerifyTarget taVerifyTarget) {
+        super(source);
+        this.taVerifyTarget = taVerifyTarget;
+    }
+
+    public TaVerifyTarget getTaVerifyTarget() {
+        return taVerifyTarget;
+    }
+}

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

@@ -1,7 +1,7 @@
 package com.yunzhi.shigongli.event.listener;
 
 import com.yunzhi.shigongli.event.PaySuccessEvent;
-import com.yunzhi.shigongli.service.ITaPersonAccountService;
+import com.yunzhi.shigongli.service.ITaOrderPayService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
@@ -9,12 +9,13 @@ import org.springframework.stereotype.Component;
 @Component
 public class PaySuccessEventListener implements ApplicationListener<PaySuccessEvent> {
     @Autowired
-    ITaPersonAccountService personAccountService;
+    ITaOrderPayService iTaOrderPayService;
 
     @Override
     public void onApplicationEvent(PaySuccessEvent evt) {
         try {
-            // do nothing
+            // 发送消息给商家
+            iTaOrderPayService.sendPaySuccessNotifyToShop(evt.getTaOrderPay());
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -0,0 +1,24 @@
+package com.yunzhi.shigongli.event.listener;
+
+import com.yunzhi.shigongli.event.VerifyResultEvent;
+import com.yunzhi.shigongli.service.ITaVerifyTargetService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+@Component
+public class VerifyResultEventListener implements ApplicationListener<VerifyResultEvent> {
+
+    @Autowired
+    ITaVerifyTargetService iTaVerifyTargetService;
+
+    @Override
+    public void onApplicationEvent(VerifyResultEvent event) {
+        try {
+            // 发送消息给商家
+            iTaVerifyTargetService.sendVerifyResultNotifyToShop(event.getTaVerifyTarget());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

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

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 订单支付 Mapper 接口
@@ -21,4 +24,6 @@ public interface TaOrderPayMapper extends BaseMapper<TaOrderPay> {
     TaOrderPay getLastPayedRowByOrder(@Param("orderId") String orderId);
 
     TaOrderPay getLastRowByOrderSub(@Param("orderId") String orderId, @Param("subOrderId") String subOrderId);
+
+    List<Map<String, Object>> getShopWorkerBy(@Param("orderId") String orderId, @Param("subOrderId") String subOrderId);
 }

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

@@ -7,6 +7,9 @@ import com.yunzhi.shigongli.vo.VerifyTargetVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 核销内容表 Mapper 接口
@@ -27,4 +30,6 @@ public interface TaVerifyTargetMapper extends BaseMapper<TaVerifyTarget> {
     int existsNo(@Param("verifyNo") String verifyNo);
 
     int getCountBy(@Param("orderId") String orderId, @Param("subOrderId") String subOrderId, @Param("isVerified") Integer isVerified);
+
+    List<String> getShopWorkerBy(@Param("shopId") String shopId);
 }

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

@@ -30,4 +30,6 @@ public interface ITaOrderPayService extends IBaseService<TaOrderPay> {
     void refundOrder(TaPerson person, TaOrder taOrder, Integer totalCashback) throws Exception;
 
     WxPayMpOrderResult prePay(TaPerson person, TaOrder taOrder, TaOrderSub taOrderSub) throws Exception;
+
+    void sendPaySuccessNotifyToShop(TaOrderPay taOrderPay);
 }

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

@@ -22,4 +22,6 @@ public interface ITaVerifyTargetService extends IBaseService<TaVerifyTarget> {
     boolean removeBy(String orderId, String subOrderId);
 
     void verify(TaVerifyTarget taVerifyTarget) throws Exception;
+
+    void sendVerifyResultNotifyToShop(TaVerifyTarget taVerifyTarget);
 }

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

@@ -96,29 +96,26 @@ public class TaHotelWorkerServiceImpl extends BaseServiceImpl<TaHotelWorkerMappe
         dataList.add(new WxMaSubscribeMessage.Data("thing6", hotelName));
         dataList.add(new WxMaSubscribeMessage.Data("date2", taRoomOrder.getStartDate()));
 
+        String templateId = messageTpl.getTemplateId();
         String page = messageTpl.getPage()
                 + "?roomId=" + taRoom.getRoomId()
+                + "&hotelId=" + taRoom.getHotelId()
                 + "&roomName=" + StringUtils.encodeURIComponent(taRoom.getRoomName());
 
         // 暂时先发送给所有店主, 1s 发送一个
         for (TaHotelWorker worker : workerList) {
             String toUser = taPersonMapper.getOpenid(worker.getPersonId());
             try {
-                sendMaSubscribeMessage(toUser, dataList, page, messageTpl.getTemplateId());
 
-                Thread.sleep(1000);
+                wxUtils.sendMessage(templateId, toUser, page, dataList);
             } catch (Exception e) {
                 log.error("发送订阅消息给店主失败: {}", e.getMessage());
                 e.printStackTrace();
-
-                // 再发一次
+            } finally {
                 try {
-                    sendMaSubscribeMessage(toUser, dataList, page, messageTpl.getTemplateId());
-
                     Thread.sleep(1000);
-                } catch (Exception e1) {
-                    log.error("发送订阅消息给店主失败: {}", e1.getMessage());
-                    e1.printStackTrace();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
                 }
             }
         }
@@ -133,18 +130,4 @@ public class TaHotelWorkerServiceImpl extends BaseServiceImpl<TaHotelWorkerMappe
         return list(queryWrapper);
     }
 
-
-    private void sendMaSubscribeMessage(String toUser, List<WxMaSubscribeMessage.Data> message, String page, String templateId) throws WxErrorException {
-        WxMaService maService = wxUtils.getService();
-        WxMaSubscribeMessage wxMaSubscribeMessage = WxMaSubscribeMessage
-                .builder()
-                .templateId(templateId)
-                .toUser(toUser)
-                .page(page)
-                .data(message)
-                .build();
-
-        maService.getMsgService().sendSubscribeMsg(wxMaSubscribeMessage);
-    }
-
 }

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

@@ -1,13 +1,12 @@
 package com.yunzhi.shigongli.service.impl;
 
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
 import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 import com.github.binarywang.wxpay.constant.WxPayConstants;
-import com.yunzhi.shigongli.common.Constants;
-import com.yunzhi.shigongli.common.DateUtils;
-import com.yunzhi.shigongli.common.StringUtils;
-import com.yunzhi.shigongli.common.WxPayUtils;
+import com.yunzhi.shigongli.common.*;
 import com.yunzhi.shigongli.entity.*;
 import com.yunzhi.shigongli.event.PaySuccessEvent;
 import com.yunzhi.shigongli.event.RefundSuccessEvent;
@@ -15,8 +14,10 @@ import com.yunzhi.shigongli.mapper.*;
 import com.yunzhi.shigongli.service.ITaOrderPayService;
 
 import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -76,6 +78,12 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
     @Autowired
     TaShopAccountLogMapper shopAccountLogMapper;
 
+    @Autowired
+    TaMiniappMessageTplMapper messageTplMapper;
+
+    @Autowired
+    WxUtils wxUtils;
+
     /**
      * 支付回调
      * @param notifyResult
@@ -194,6 +202,9 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
         }
 
         Integer cashback = orderSubList.stream().mapToInt(TaOrderSub::getCashback).reduce(Integer::sum).getAsInt();
+        if (cashback <= 0) {
+            return ;
+        }
 
         TaOrderPay orderPay = null != taOrder ? createByOrder(taOrder) : createByOrderSub(taOrderSub, taPerson);
         orderPay.setDescription("返现");
@@ -233,9 +244,10 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
                 taVerifyTarget.setTargetId(item.getPackageId());
                 taVerifyTarget.setDescription(shopPackage.getDescription());
                 taVerifyTarget.setPoster(shopPackage.getPoster());
-                taVerifyTarget.setActualPrice(shopPackage.getActualPrice());
+                taVerifyTarget.setActualPrice(item.getUnitPrice());
                 taVerifyTarget.setStandPrice(shopPackage.getStandardPrice());
-                taVerifyTarget.setCashback(shopPackage.getCashback());
+                taVerifyTarget.setCashback(item.getCashback() / item.getAmount());
+                taVerifyTarget.setCommissionCharge(item.getCommissionCharge() / item.getAmount());
                 taVerifyTarget.setCreateDate(now);
                 taVerifyTarget.setExpireDate(shopPackage.getEndTime());
                 taVerifyTarget.setOrderDate(item.getCreateDate());
@@ -409,6 +421,56 @@ public class TaOrderPayServiceImpl extends BaseServiceImpl<TaOrderPayMapper, TaO
         return wxPayUtils.createOrder(person, orderPay);
     }
 
+    /**
+     * 支付成功消息
+     * @param taOrderPay
+     */
+    @Async
+    @Override
+    public void sendPaySuccessNotifyToShop(TaOrderPay taOrderPay) {
+        try {
+            // 消息模板
+            TaMiniappMessageTpl messageTpl = messageTplMapper.selectByType(Constants.TPL_MESSAGE_SHOP_PAY_SUCCESS);
+            if (null == messageTpl) {
+                return ;
+            }
+
+            String templateId = messageTpl.getTemplateId();
+            String page = messageTpl.getPage();
+
+            String orderId = taOrderPay.getOrderId();
+            String subOrderId = taOrderPay.getSubOrderId();
+
+            List<Map<String, Object>> list = orderPayMapper.getShopWorkerBy(orderId, subOrderId);
+            if (null == list || list.size() == 0) return;
+
+            for (Map<String, Object> item : list) {
+                String openId = item.get("openid").toString();
+                if (StringUtils.isEmpty(openId)) continue;
+
+                List<WxMaSubscribeMessage.Data> dataList = new ArrayList<>();
+                dataList.add(new WxMaSubscribeMessage.Data("character_string7", orderId));
+                dataList.add(new WxMaSubscribeMessage.Data("thing13", "您有一个十公里订单，客人期待与你的见面哦"));
+
+                try {
+                   wxUtils.sendMessage(templateId, openId, page, dataList);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error("发送订单消息失败: {}", e.getMessage());
+                } finally {
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     private TaOrderPay createByOrder(TaOrder taOrder) throws Exception {
         // 发给微信的订单号为  订单ID-01 这种
         Integer no = taSequenceMapper.nextval(taOrder.getOrderId());

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

@@ -81,6 +81,7 @@ public class TaShopServiceImpl extends BaseServiceImpl<TaShopMapper, TaShop> imp
         BeanUtils.copyProperties(taShop, taResource);
         taResource.setTargetType(Constants.TARGET_SHOP);
         taResource.setTargetId(taShop.getShopId());
+        taResource.setTargetName(taShop.getShopName());
         taResource.setLikeNum(taShop.getLikeNum());
         if (!StringUtils.isEmpty(taShop.getLocaton())) {
             String[] loc = taShop.getLocaton().split(",");

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

@@ -79,6 +79,7 @@ public class TaTouristServiceImpl extends BaseServiceImpl<TaTouristMapper, TaTou
         BeanUtils.copyProperties(taTourist, taResource);
         taResource.setTargetType(Constants.TARGET_TOURIST);
         taResource.setTargetId(taTourist.getTouristId());
+        taResource.setTargetName(taTourist.getTouristName());
         if (!StringUtils.isEmpty(taTourist.getLocaton())) {
             String[] loc = taTourist.getLocaton().split(",");
             taResource.setLng(loc[0].trim());

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

@@ -1,20 +1,27 @@
 package com.yunzhi.shigongli.service.impl;
 
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.common.WxUtils;
 import com.yunzhi.shigongli.entity.*;
 import com.yunzhi.shigongli.mapper.*;
 import com.yunzhi.shigongli.service.ITaVerifyTargetService;
 import com.yunzhi.shigongli.vo.VerifyTargetVO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.object.UpdatableSqlQuery;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -24,6 +31,7 @@ import java.util.List;
  * @author yansen
  * @since 2021-08-17
  */
+@Slf4j
 @Service
 public class TaVerifyTargetServiceImpl extends BaseServiceImpl<TaVerifyTargetMapper, TaVerifyTarget> implements ITaVerifyTargetService {
 
@@ -48,6 +56,12 @@ public class TaVerifyTargetServiceImpl extends BaseServiceImpl<TaVerifyTargetMap
     @Autowired
     TaHotelAccountLogMapper hotelAccountLogMapper;
 
+    @Autowired
+    TaMiniappMessageTplMapper messageTplMapper;
+
+    @Autowired
+    WxUtils wxUtils;
+
     @Override
     public IPage<VerifyTargetVO> getWxPagedBy(IPage<VerifyTargetVO> pg, String personId, String shopId, String phone, Integer isVerified) {
         return baseMapper.getWxPagedBy(pg, personId, shopId, phone, isVerified);
@@ -79,4 +93,49 @@ public class TaVerifyTargetServiceImpl extends BaseServiceImpl<TaVerifyTargetMap
         }
     }
 
+    @Async
+    @Override
+    public void sendVerifyResultNotifyToShop(TaVerifyTarget taVerifyTarget) {
+        try {
+            // 消息模板
+            TaMiniappMessageTpl messageTpl = messageTplMapper.selectByType(Constants.TPL_MESSAGE_SHOP_VERIFY_RESULT);
+            if (null == messageTpl) {
+                return ;
+            }
+
+            String templateId = messageTpl.getTemplateId();
+            String page = messageTpl.getPage();
+
+            String orderId = taVerifyTarget.getOrderId();
+            String shopId = taVerifyTarget.getShopId();
+
+            List<String> list = baseMapper.getShopWorkerBy(shopId);
+            if (null == list || list.size() == 0) return;
+
+            for (String openId : list) {
+                if (StringUtils.isEmpty(openId)) continue;
+
+                List<WxMaSubscribeMessage.Data> dataList = new ArrayList<>();
+                dataList.add(new WxMaSubscribeMessage.Data("character_string1", orderId));
+                dataList.add(new WxMaSubscribeMessage.Data("thing5", "您有新的十公里订单已核销，请注意查收"));
+
+                try {
+                    wxUtils.sendMessage(templateId, openId, page, dataList);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error("发送订单核销消息失败: {}", e.getMessage());
+                } finally {
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 }

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

@@ -41,10 +41,18 @@ public class ShopPackageVO {
     @ApiModelProperty(value = "描述")
     private String description;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "最小适用人数")
+    private Integer minPerson;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "最大适用人数")
+    private Integer maxPerson;
+
     @ExcelProperty(value = "适用人数", index = 2)
     @ColumnWidth(20)
     @ApiModelProperty(value = "适用人数")
-    private Integer personNum;
+    private String personNum;
 
     @ExcelIgnore
     @ApiModelProperty(value = "主图")

src/main/resources/application-dev.yml

@@ -14,7 +14,3 @@ logging:
   level:
     root: info
     springfox: info
-
-weixin:
-  pay:
-    keyPath: E:/work/shigongli/v2/service/cert/apiclient_cert.p12

src/main/resources/application-prod.yml

@@ -10,3 +10,21 @@ spring:
     url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/shigongli-v2?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: shigongli
     password: shigongli@123
+
+
+weixin:
+  miniapp:
+    appid: wx06a7372d48d56843
+    secret: ead0c7b1dd40ce828b1fd9bf18183584
+    token:
+    aesKey:
+    msgDataFormat: JSON
+  pay:
+    appId: wx06a7372d48d56843
+    mchId: 1612121997
+    mchKey: fUbYPldU5bUCYRl97vMv69JQujsJ8dj5
+    subAppId:
+    subMchId:
+    keyPath: /opt/yunzhi/sgl-v2/cert/apiclient_cert.p12
+    notifyUrl: https://sgl-v2.njyunzhi.com/api/wxpay/notify/order
+    refundNotifyUrl: https://sgl-v2.njyunzhi.com/api/wxpay/notify/refund

src/main/resources/application.yml

@@ -59,9 +59,9 @@ weixin:
     mchKey: fUbYPldU5bUCYRl97vMv69JQujsJ8dj5
     subAppId:
     subMchId:
-    keyPath: /yunpan/shigongli/cert/apiclient_cert.p12
-    notifyUrl: https://sgl-v2.njyunzhi.com/api/wxpay/notify/order
-    refundNotifyUrl: https://sgl-v2.njyunzhi.com/api/wxpay/notify/refund
+    keyPath: E:/work/shigongli/v2/service/cert/apiclient_cert.p12
+    notifyUrl: https://sgl-v2-test.njyunzhi.com/api/wxpay/notify/order
+    refundNotifyUrl: https://sgl-v2-test.njyunzhi.com/api/wxpay/notify/refund
 
 ## 高德地图
 amap:

src/main/resources/mapper/TaOrderPayMapper.xml

@@ -42,4 +42,22 @@
             t.create_date DESC
             LIMIT 1
     </select>
+    <select id="getShopWorkerBy" resultType="java.util.Map">
+        SELECT DISTINCT
+            t.shop_id,
+            p.openid
+        FROM
+            ta_order_sub t
+                INNER JOIN ta_shop_worker s ON s.shop_id = t.shop_id
+                INNER JOIN ta_person p ON p.person_id = s.person_id
+        WHERE
+            t.order_id = #{orderId}
+          <if test="subOrderId != null and subOrderId != ''">
+              AND t.sub_order_id = #{subOrderId}
+          </if>
+          AND t.`status` = 1
+          AND s.`status` = 1
+          AND p.`status` = 1
+    </select>
+
 </mapper>

src/main/resources/mapper/TaOrderSubMapper.xml

@@ -173,7 +173,7 @@
             t.shop_id,
             s.shop_name,
             t.description,
-            sum( t.charges ) AS charges,
+            sum( IF( t.`status` = 0, 0 , t.charges) ) AS charges,
             sum( t.amount ) AS amount,
             sum( t.cashback ) AS cashback,
             sum( IF ( t.is_verified = 1, t.charges - t.commission_charge - t.cashback, 0 ) ) AS verfied_charge,

src/main/resources/mapper/TaSaveMapper.xml

@@ -32,6 +32,7 @@
                         NULL                                     AS resource_no,
                         a.target_type,
                         a.target_id,
+                        '' as target_name,
                         0                                        AS like_num,
                         0                                        AS pv_num,
                         0                                        AS uv_num,

src/main/resources/mapper/TaShopPackageMapper.xml

@@ -10,6 +10,7 @@
     <sql id="queryShopPackage">
         SELECT
             t.*,
+            concat(t.min_person, '-', t.max_person) as person_num,
             m.shop_name,
             s.traffic_rate,
             s.platform_rate,

src/main/resources/mapper/TaTargetQuotaMapper.xml

@@ -67,7 +67,10 @@
                 ) AS is_saved
             FROM
                 ta_resource t
-            WHERE LOWER(t.title) like LOWER(CONCAT('%', #{word}, '%'))
+            WHERE (
+                LOWER(t.title) like LOWER(CONCAT('%', #{word}, '%'))
+                OR LOWER(t.target_name) like LOWER(CONCAT('%', #{word}, '%'))
+                    )
               <if test="targetType != null and targetType != ''">
                   AND t.target_type = #{targetType}
               </if>

src/main/resources/mapper/TaVerifyTargetMapper.xml

@@ -49,4 +49,15 @@
         </if>
             AND t.`status` &gt; - 1
     </select>
+    <select id="getShopWorkerBy" resultType="java.lang.String">
+        SELECT
+            s.openid
+        FROM
+            ta_shop_worker t
+                INNER JOIN ta_person s ON s.person_id = t.person_id
+        WHERE
+            t.shop_id = #{shopId}
+          AND t.`status` = 1
+          AND s.`status` = 1
+    </select>
 </mapper>