feats

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

@@ -52,4 +52,10 @@ public class Constants {
     public final static int WORK_PAUSE = 2;   // 暂停
     public final static int WORK_DONE = 3;   // 已完成
 
+    // 消息类型
+    public final static String MESSAGE_SMS = "sms"; // 短信
+    public final static String MESSAGE_MINIAPP = "miniapp"; // 小程序
+
+    public final static String MESSAGE_ORDER_NOTIFY = "order_notify";   // 订单通知
+    public final static String MESSAGE_ORDER_EXPIRE = "order_expire";   // 订单超时
 }

src/main/java/com/yunzhi/nanyang/common/MessageUtil.java

@@ -0,0 +1,60 @@
+package com.yunzhi.nanyang.common;
+
+import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.yunzhi.nanyang.entity.TaMessageTemplate;
+import lombok.Data;
+
+import java.util.Formatter;
+import java.util.List;
+
+public class MessageUtil {
+
+    public static List<WxMaSubscribeMessage.MsgData> getWxMessageData(String jsonStr, Object ...values) {
+        String str = new Formatter().format(jsonStr, values).toString();
+
+        return JSONArray.parseArray(str, WxMaSubscribeMessage.MsgData.class);
+    }
+
+    public static WxMaSubscribeMessage getWxMaSubscribeMessage(TaMessageTemplate taMessageTemplate) {
+        if (null == taMessageTemplate) return null;
+
+        WxMaSubscribeMessage message = new WxMaSubscribeMessage();
+        message.setTemplateId(taMessageTemplate.getAppTplId());
+
+        return message;
+    }
+
+    public static SMSUtils.Message getSmsMessage(TaMessageTemplate taMessageTemplate) {
+        if (null == taMessageTemplate) return null;
+
+        SMSUtils.Message message = new SMSUtils.Message();
+        message.setCode(taMessageTemplate.getAppTplId());
+        message.setSign(taMessageTemplate.getAppTplSign());
+
+        return message;
+    }
+
+    @Data
+    public static class NaviPage {
+        private String page;
+        private String query;
+
+        NaviPage() {}
+        public static NaviPage fromJSON(String jsonStr) {
+            JSONObject jsonObject = JSONObject.parseObject(jsonStr);
+            NaviPage naviPage = new NaviPage();
+            naviPage.page = (String) jsonObject.get("page");
+            naviPage.query = (String) jsonObject.get("query");
+            return naviPage;
+        }
+
+        public String toURL(Object ...values) {
+            String queryString = new Formatter().format(this.query, values).toString();
+            return this.page + "?" + queryString;
+        }
+
+    }
+
+}

src/main/java/com/yunzhi/nanyang/controller/TaDispatchController.java

@@ -7,6 +7,7 @@ import com.yunzhi.nanyang.common.*;
 import com.yunzhi.nanyang.entity.SysUser;
 import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.entity.TaWorkJob;
+import com.yunzhi.nanyang.event.WorkDispatchEvent;
 import com.yunzhi.nanyang.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -15,6 +16,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 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.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -62,6 +64,9 @@ public class TaDispatchController extends BaseController {
     @Autowired
     public ISysUserService iSysUserService;
 
+    @Autowired
+    ApplicationEventPublisher applicationEventPublisher;
+
 
     /**
      * 分页查询列表
@@ -143,11 +148,14 @@ public class TaDispatchController extends BaseController {
         if (iTaDispatchService.save(taDispatch)){
 
             // 生成作业信息
-            iTaWorkJobService.createByDispatch(taDispatch, taOrder);
+            TaWorkJob taWorkJob = iTaWorkJobService.createByDispatch(taDispatch, taOrder);
 
             // 更新订单状态
             iTaOrderService.updateStatus(taDispatch.getOrderId(), "dispatch_status", Constants.DISPATCH_DONE);
 
+            // 发送通知
+            applicationEventPublisher.publishEvent(new WorkDispatchEvent(this, taWorkJob, taOrder));
+
             return ResponseBean.success(taDispatch);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -221,11 +229,12 @@ public class TaDispatchController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     * @param orderId  实体ID
      */
     @RequestMapping(value="/admin/order/{orderId}/dispatch",method= RequestMethod.GET)
     @ApiOperation(value="调度详情", notes = "调度详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taDispatchGet(@ApiParam("订单ID") @PathVariable String orderId) throws Exception{
-        return ResponseBean.success(iTaDispatchService.getExistBy("order_id", orderId, false, true));
+        TaDispatch taDispatch = iTaDispatchService.getExistBy("order_id", orderId, false, true);
+        return ResponseBean.success(taDispatch);
     }
 }

src/main/java/com/yunzhi/nanyang/controller/TaMessageTemplateController.java

@@ -0,0 +1,119 @@
+package com.yunzhi.nanyang.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.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.ResponseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.yunzhi.nanyang.service.ITaMessageTemplateService;
+import com.yunzhi.nanyang.entity.TaMessageTemplate;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 消息模板 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-04-11
+ */
+
+@Api(tags = "消息模板")
+@RestController
+@RequestMapping("/")
+public class TaMessageTemplateController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaMessageTemplateController.class);
+
+    @Autowired
+    public ITaMessageTemplateService iTaMessageTemplateService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taMessageTemplate",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taMessageTemplateList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+
+		    IPage<TaMessageTemplate> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaMessageTemplate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaMessageTemplate> result = iTaMessageTemplateService.page(pg, queryWrapper);
+            return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taMessageTemplate 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taMessageTemplate",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taMessageTemplateAdd(@ApiParam("保存内容") @RequestBody TaMessageTemplate taMessageTemplate) throws Exception{
+
+        if (iTaMessageTemplateService.save(taMessageTemplate)){
+            return ResponseBean.success(taMessageTemplate);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taMessageTemplate/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taMessageTemplateDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        if(iTaMessageTemplateService.removeById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taMessageTemplate 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taMessageTemplate/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taMessageTemplateUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+                                        @ApiParam("更新内容") @RequestBody TaMessageTemplate taMessageTemplate) throws Exception{
+
+        if (iTaMessageTemplateService.updateById(taMessageTemplate)){
+            return ResponseBean.success(iTaMessageTemplateService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taMessageTemplate/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taMessageTemplateGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        return ResponseBean.success(iTaMessageTemplateService.getById(id));
+    }
+}

src/main/java/com/yunzhi/nanyang/controller/TaWithdrawalController.java

@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.nanyang.common.*;
 import com.yunzhi.nanyang.entity.*;
-import com.yunzhi.nanyang.service.ISysUserService;
-import com.yunzhi.nanyang.service.ITaAccountService;
-import com.yunzhi.nanyang.service.ITaBankCardService;
+import com.yunzhi.nanyang.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -19,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import com.yunzhi.nanyang.service.ITaWithdrawalService;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
@@ -52,6 +49,9 @@ public class TaWithdrawalController extends BaseController {
     @Autowired
     public ITaAccountService iTaAccountService;
 
+    @Autowired
+    public ITaOrgService iTaOrgService;
+
 
     /**
      * 分页查询列表
@@ -120,6 +120,7 @@ public class TaWithdrawalController extends BaseController {
         taWithdrawal.setUserId(sysUser.getUserId());
         taWithdrawal.setUserName(sysUser.getUserName());
         taWithdrawal.setOrgId(sysUser.getOrgId());
+        taWithdrawal.setStatus(Constants.STATUS_NORMAL);
 
         if (iTaWithdrawalService.save(taWithdrawal)){
             return ResponseBean.success(taWithdrawal);
@@ -256,6 +257,7 @@ public class TaWithdrawalController extends BaseController {
         origin.setAuditUserName(sysUser.getUserName());
         origin.setAuditStatus(taWithdrawal.getAuditStatus());
         origin.setAuditRemark(taWithdrawal.getAuditRemark());
+        origin.setAuditDate(LocalDateTime.now());
 
         if (iTaWithdrawalService.updateById(origin)){
 
@@ -280,6 +282,9 @@ public class TaWithdrawalController extends BaseController {
             return ResponseBean.error("提现申请不存在");
         }
 
+        SysUser user = iSysUserService.getById(taWithdrawal.getUserId());
+        taWithdrawal.setPhone(user.getPhone());
+
         SysUser sysUser = currentUser();
         String orgId = taWithdrawal.getOrgId();
         boolean isAdmin = Constants.ADMIN_ID.equals(sysUser.getUserId());
@@ -289,6 +294,9 @@ public class TaWithdrawalController extends BaseController {
             }
         }
 
+        TaOrg taOrg = iTaOrgService.getById(orgId);
+        taWithdrawal.setOrgName(taOrg.getName());
+
         TaBankCard taBankCard = iTaBankCardService.getById(taWithdrawal.getAccountCardNo());
         taWithdrawal.setBankCard(taBankCard);
 

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

@@ -6,8 +6,10 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.yunzhi.nanyang.common.*;
 import com.yunzhi.nanyang.entity.SysMiniapp;
+import com.yunzhi.nanyang.entity.TaMessageTemplate;
 import com.yunzhi.nanyang.entity.TaPerson;
 import com.yunzhi.nanyang.service.ISysMiniappService;
+import com.yunzhi.nanyang.service.ITaMessageTemplateService;
 import com.yunzhi.nanyang.service.ITaPersonService;
 import com.yunzhi.nanyang.shiro.utils.JWTUtil;
 import com.yunzhi.nanyang.vo.LoginParam;
@@ -21,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Api(tags = "小程序登入/登出")
@@ -34,6 +37,9 @@ public class WxMaController extends BaseController {
     @Autowired
     ITaPersonService iTaPersonService;
 
+    @Autowired
+    ITaMessageTemplateService iTaMessageTemplateService;
+
     @Autowired
     SMSCaptcha smsCaptcha;
 
@@ -60,6 +66,13 @@ public class WxMaController extends BaseController {
     public ResponseBean preload(@ApiParam("客户端ID") @PathVariable String clientId,
                                 @ApiParam("小程序预加载参数") @RequestParam WxMaPreload wxMaPreload) throws Exception {
 
+        if (Constants.CLIENT_WORKER.equals(clientId)) {
+            List<TaMessageTemplate> list = iTaMessageTemplateService.getByTplType(Constants.MESSAGE_MINIAPP);
+            ResponseBean.success(new HashMap<String, Object>(){{
+                put("tpls", list);
+            }});
+        }
+
         return ResponseBean.success(null);
     }
 

src/main/java/com/yunzhi/nanyang/entity/TaMessageTemplate.java

@@ -0,0 +1,57 @@
+package com.yunzhi.nanyang.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 消息模板
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-04-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaMessageTemplate对象", description="消息模板")
+public class TaMessageTemplate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "模板ID")
+    @TableId(value = "tpl_id", type = IdType.AUTO)
+    private Integer tplId;
+
+    @ApiModelProperty(value = "模板类型;sms短信,miniapp小程序")
+    private String tplType;
+
+    @ApiModelProperty(value = "适用业务")
+    private String bizType;
+
+    @ApiModelProperty(value = "模块ID")
+    private String appId;
+
+    @ApiModelProperty(value = "对应模板ID;模板类型对应的模板ID,比如短信模板ID")
+    private String appTplId;
+
+    @ApiModelProperty(value = "模板sign")
+    private String appTplSign;
+
+    @ApiModelProperty(value = "模板内容;JSON格式")
+    private String appTplContent;
+
+    @ApiModelProperty(value = "模板动作;JSON格式")
+    private String appTplAction;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+
+}

src/main/java/com/yunzhi/nanyang/entity/TaWithdrawal.java

@@ -38,6 +38,10 @@ public class TaWithdrawal implements Serializable {
     @ApiModelProperty(value = "申请人姓名")
     private String userName;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "申请人手机号")
+    private String phone;
+
     @ApiModelProperty(value = "提现金额")
     private Integer money;
 
@@ -53,6 +57,9 @@ public class TaWithdrawal implements Serializable {
     @ApiModelProperty(value = "审核结果")
     private String auditRemark;
 
+    @ApiModelProperty(value = "审核时间")
+    private LocalDateTime auditDate;
+
     @ApiModelProperty(value = "备注")
     private String remarks;
 
@@ -71,6 +78,7 @@ public class TaWithdrawal implements Serializable {
     @ApiModelProperty(value = "机构ID")
     private String orgId;
 
+    @TableField(exist = false)
     @ApiModelProperty(value = "机构名称")
     private String orgName;
 

src/main/java/com/yunzhi/nanyang/event/WorkDispatchEvent.java

@@ -0,0 +1,19 @@
+package com.yunzhi.nanyang.event;
+
+import com.yunzhi.nanyang.entity.TaOrder;
+import com.yunzhi.nanyang.entity.TaWorkJob;
+import org.springframework.context.ApplicationEvent;
+
+public class WorkDispatchEvent extends ApplicationEvent {
+    private TaWorkJob taWorkJob;
+    private TaOrder taOrder;
+
+    public WorkDispatchEvent(Object source, TaWorkJob taDispatch, TaOrder taOrder) {
+        super(source);
+        this.taWorkJob = taDispatch;
+        this.taOrder = taOrder;
+    }
+
+    public TaWorkJob getTaWorkJob() { return taWorkJob; }
+    public TaOrder getTaOrder() { return taOrder; }
+}

src/main/java/com/yunzhi/nanyang/event/listener/WorkDispatchEventListener.java

@@ -0,0 +1,18 @@
+package com.yunzhi.nanyang.event.listener;
+
+import com.yunzhi.nanyang.event.WorkDispatchEvent;
+import com.yunzhi.nanyang.service.ITaMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+@Component
+public class WorkDispatchEventListener implements ApplicationListener<WorkDispatchEvent> {
+    @Autowired
+    ITaMessageService iTaMessageService;
+
+    @Override
+    public void onApplicationEvent(WorkDispatchEvent evt) {
+        iTaMessageService.sendMessage(evt);
+    }
+}

src/main/java/com/yunzhi/nanyang/mapper/TaMessageTemplateMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.nanyang.mapper;
+
+import com.yunzhi.nanyang.entity.TaMessageTemplate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 消息模板 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-04-11
+ */
+@Mapper
+public interface TaMessageTemplateMapper extends BaseMapper<TaMessageTemplate> {
+
+}

src/main/java/com/yunzhi/nanyang/mapper/TaPersonMapper.java

@@ -19,4 +19,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     @Select("SELECT * FROM ta_person t WHERE t.app_id = #{appid} AND t.openid = #{openid} AND t.`status` > -1")
     TaPerson getByOpenId(@Param("appid") String appid, @Param("openid") String openid);
+
+    @Select("SELECT * FROM ta_person t WHERE t.user_id = #{userId} AND t.`status` > -1")
+    TaPerson getByUserId(@Param("userId") String userId);
 }

src/main/java/com/yunzhi/nanyang/service/ITaMessageService.java

@@ -2,6 +2,7 @@ package com.yunzhi.nanyang.service;
 
 import com.yunzhi.nanyang.entity.TaMessage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.nanyang.event.WorkDispatchEvent;
 import com.yunzhi.nanyang.event.WorkExpiredEvent;
 
 /**
@@ -15,4 +16,6 @@ import com.yunzhi.nanyang.event.WorkExpiredEvent;
 public interface ITaMessageService extends IBaseService<TaMessage> {
 
     void sendMessage(WorkExpiredEvent evt);
+
+    void sendMessage(WorkDispatchEvent evt);
 }

src/main/java/com/yunzhi/nanyang/service/ITaMessageTemplateService.java

@@ -0,0 +1,20 @@
+package com.yunzhi.nanyang.service;
+
+import com.yunzhi.nanyang.entity.TaMessageTemplate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 消息模板 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-04-11
+ */
+public interface ITaMessageTemplateService extends IService<TaMessageTemplate> {
+    TaMessageTemplate getTemplateByType(String tplType, String bizType);
+
+    List<TaMessageTemplate> getByTplType(String tplType);
+}

src/main/java/com/yunzhi/nanyang/service/impl/TaAccountServiceImpl.java

@@ -64,7 +64,7 @@ public class TaAccountServiceImpl extends BaseServiceImpl<TaAccountMapper, TaAcc
             amount += totalMoney;
         }
 
-        return taAccount.getAmounts() > amount;
+        return taAccount.getAmounts() >= amount;
     }
 
     @Transactional(rollbackFor = Exception.class)

src/main/java/com/yunzhi/nanyang/service/impl/TaMessageServiceImpl.java

@@ -1,14 +1,22 @@
 package com.yunzhi.nanyang.service.impl;
 
-import com.yunzhi.nanyang.entity.TaDispatch;
-import com.yunzhi.nanyang.entity.TaMessage;
+import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
+import com.yunzhi.nanyang.common.*;
+import com.yunzhi.nanyang.entity.*;
+import com.yunzhi.nanyang.event.WorkDispatchEvent;
 import com.yunzhi.nanyang.event.WorkExpiredEvent;
 import com.yunzhi.nanyang.mapper.TaMessageMapper;
+import com.yunzhi.nanyang.mapper.TaPersonMapper;
 import com.yunzhi.nanyang.service.ITaMessageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.nanyang.service.ITaMessageTemplateService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息表 服务实现类
@@ -17,12 +25,77 @@ import org.springframework.stereotype.Service;
  * @author yansen
  * @since 2022-03-08
  */
+@Slf4j
 @Service
 public class TaMessageServiceImpl extends BaseServiceImpl<TaMessageMapper, TaMessage> implements ITaMessageService {
 
+    @Autowired
+    TaPersonMapper taPersonMapper;
+
+    @Autowired
+    ITaMessageTemplateService iTaMessageTemplateService;
+
+    @Autowired
+    WxUtils wxUtils;
+
     @Async
     @Override
     public void sendMessage(WorkExpiredEvent evt) {
         evt.getTaDispatch();
     }
+
+    @Async
+    @Override
+    public void sendMessage(WorkDispatchEvent evt) {
+
+        try {
+            TaWorkJob taWorkJob = evt.getTaWorkJob();
+            String jobId = taWorkJob.getJobId();
+            TaOrder taOrder = evt.getTaOrder();
+            String orderNo = taOrder.getOrderNo();
+            TaPerson taPerson = taPersonMapper.getByUserId(taWorkJob.getWorkerId());
+            if (null == taPerson) {
+                log.error("发送消息失败, 未找到对应的人员信息 " + taWorkJob.getWorkerId());
+                return;
+            }
+
+            // 先发送小程序
+            try {
+                TaMessageTemplate tpl = iTaMessageTemplateService.getTemplateByType(Constants.MESSAGE_MINIAPP, Constants.MESSAGE_ORDER_NOTIFY);
+                WxMaSubscribeMessage message = MessageUtil.getWxMaSubscribeMessage(tpl);
+                if (null != message) {
+                    message.setToUser(taPerson.getOpenid());
+                    String actionStr = tpl.getAppTplAction();
+                    message.setPage(MessageUtil.NaviPage.fromJSON(actionStr).toURL(jobId));
+                    List<WxMaSubscribeMessage.MsgData> data = MessageUtil.getWxMessageData(tpl.getAppTplContent(),
+                            orderNo,
+                            taWorkJob.getMachineryName(),
+                            "已派单",
+                            DateUtils.toString(taWorkJob.getCreateDate(), "yyyy-MM-dd HH:mm"));
+                    message.setData(data);
+
+                    wxUtils.getWorkerService().getMsgService().sendSubscribeMsg(message);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            // 再发送短信
+            try {
+                TaMessageTemplate tpl = iTaMessageTemplateService.getTemplateByType(Constants.MESSAGE_SMS, Constants.MESSAGE_ORDER_NOTIFY);
+                SMSUtils.Message message = MessageUtil.getSmsMessage(tpl);
+                if (!StringUtils.isEmpty(taPerson.getPhone()) && null != message) {
+                    message.setTel(taPerson.getPhone());
+                    message.setContent(String.format(tpl.getAppTplContent(), taWorkJob.getWorkerName(), orderNo));
+                } else {
+                    log.error("发送短信失败, 可能无用户手机 " + taPerson.getPersonId());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

src/main/java/com/yunzhi/nanyang/service/impl/TaMessageTemplateServiceImpl.java

@@ -0,0 +1,44 @@
+package com.yunzhi.nanyang.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.nanyang.common.Constants;
+import com.yunzhi.nanyang.entity.TaMessageTemplate;
+import com.yunzhi.nanyang.mapper.TaMessageTemplateMapper;
+import com.yunzhi.nanyang.service.ITaMessageTemplateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 消息模板 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-04-11
+ */
+@Service
+public class TaMessageTemplateServiceImpl extends ServiceImpl<TaMessageTemplateMapper, TaMessageTemplate> implements ITaMessageTemplateService {
+
+    @Override
+    public TaMessageTemplate getTemplateByType(String tplType, String bizType) {
+        QueryWrapper<TaMessageTemplate> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("tpl_type", tplType);
+        queryWrapper.eq("biz_type", bizType);
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+
+        return getOne(queryWrapper);
+    }
+
+    @Override
+    public List<TaMessageTemplate> getByTplType(String tplType) {
+        QueryWrapper<TaMessageTemplate> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("tpl_type", tplType);
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+
+        return list(queryWrapper);
+    }
+
+
+}

src/main/java/com/yunzhi/nanyang/vo/AccountRecord.java

@@ -31,4 +31,7 @@ public class AccountRecord extends TaAccountLog {
 
     @ApiModelProperty(value = "订单号")
     private String orderNo;
+
+    @ApiModelProperty(value = "支付方式")
+    private String payType;
 }

src/main/resources/mapper/TaAccountLogMapper.xml

@@ -5,18 +5,20 @@
     <select id="getPageBy" resultType="com.yunzhi.nanyang.vo.AccountRecord">
         SELECT
             t.*,
-            n.person_id,
-            n.nick_name as person_name,
+            IFNULL(n.person_id, w.user_id) as person_id,
+            IFNULL(n.nick_name, w.user_name) as person_name,
             n.phone,
             m.order_id as real_order_id,
             m.order_no,
             s.description,
-            s.pay_date
+            s.pay_date,
+            s.pay_type
         FROM
             ta_account_log t
-                INNER JOIN ta_pay s ON t.pay_id = s.pay_id
-                INNER JOIN ta_order m ON s.order_id = m.order_id
-                INNER JOIN ta_person n ON m.person_id = n.person_id
+                LEFT JOIN ta_pay s ON t.pay_id = s.pay_id
+                LEFT JOIN ta_order m ON t.order_id = m.order_id
+                LEFT JOIN ta_person n ON m.person_id = n.person_id
+                LEFT JOIN ta_withdrawal w ON t.order_id = w.withdrawal_id
         ORDER BY
             t.create_date DESC
     </select>

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