feats

pom.xml

@@ -93,10 +93,18 @@
 		<dependency>
 			<groupId>com.github.binarywang</groupId>
 			<artifactId>weixin-java-miniapp</artifactId>
-			<version>3.8.0</version>
+			<version>4.2.0</version>
 		</dependency>
 		<!--weixin-miniapp start-->
 
+		<!--weixin-pay start-->
+		<dependency>
+			<groupId>com.github.binarywang</groupId>
+			<artifactId>weixin-java-pay</artifactId>
+			<version>4.2.0</version>
+		</dependency>
+		<!--weixin-pay start-->
+
 		<!--lombok start-->
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -155,11 +163,30 @@
 							</excludes>
 						</configuration>
 					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-resources-plugin</artifactId>
+						<configuration>
+							<encoding>UTF-8</encoding>
+							<nonFilteredFileExtensions>
+								<nonFilteredFileExtension>pem</nonFilteredFileExtension>
+								<nonFilteredFileExtension>pfx</nonFilteredFileExtension>
+								<nonFilteredFileExtension>p12</nonFilteredFileExtension>
+							</nonFilteredFileExtensions>
+						</configuration>
+					</plugin>
 				</plugins>
 				<resources>
 					<resource>
 						<directory>src/main/resources</directory>
 						<filtering>true</filtering>
+						<includes>
+							<include>**/*.xml</include>
+							<include>**/*.p12</include>
+							<include>**/*.pem</include>
+							<include>application.yml</include>
+							<include>application-${profileActive}.yml</include>
+						</includes>
 					</resource>
 				</resources>
 			</build>
@@ -190,6 +217,18 @@
 							<testFailureIgnore>true</testFailureIgnore>
 						</configuration>
 					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-resources-plugin</artifactId>
+						<configuration>
+							<encoding>UTF-8</encoding>
+							<nonFilteredFileExtensions>
+								<nonFilteredFileExtension>pem</nonFilteredFileExtension>
+								<nonFilteredFileExtension>pfx</nonFilteredFileExtension>
+								<nonFilteredFileExtension>p12</nonFilteredFileExtension>
+							</nonFilteredFileExtensions>
+						</configuration>
+					</plugin>
 				</plugins>
 				<resources>
 					<resource>
@@ -204,6 +243,9 @@
 						<directory>src/main/resources</directory>
 						<filtering>true</filtering>
 						<includes>
+							<include>**/*.xml</include>
+							<include>**/*.p12</include>
+							<include>**/*.pem</include>
 							<include>application.yml</include>
 							<include>application-${profileActive}.yml</include>
 						</includes>

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

@@ -15,9 +15,14 @@ public class Constants {
     public final static String TARGET_MACHINERY = "machinery";  // 农机
     public final static String TARGET_NEWS = "news";    // 资讯
 
+    // 订单状态
+    public final static int ORDER_CANCEL = 9;  // 待支付
+
     // 支付状态
     public final static int PAY_READY = 0;  // 待支付
     public final static int PAY_PAID = 1;  // 已支付
+    public final static int PAY_FAIL = 2;  // 支付失败
+    public final static int PAY_REFUNDING = 3;  // 退款申请中
     public final static int PAY_REFUND = -1;  // 已退款
 
     // 是否调度

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

@@ -4,6 +4,10 @@ import java.time.*;
 import java.time.format.DateTimeFormatter;
 
 public class DateUtils {
+    public static LocalDateTime from(String str, DateTimeFormatter fmt) {
+        return LocalDateTime.parse(str, fmt);
+    }
+
     public static LocalDateTime from(String str, String formater) {
         DateTimeFormatter fmt = DateTimeFormatter.ofPattern(formater);
         return LocalDateTime.parse(str, fmt);

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

@@ -0,0 +1,191 @@
+package com.yunzhi.nanyang.common;
+
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.*;
+import java.util.Enumeration;
+
+@Slf4j
+public class IpUtil {
+    private static final String LOCAL_IP = "127.0.0.1";
+    /**
+     * 获取IP地址
+     *
+     * 使用Nginx等反向代理软件， 则不能通过request.getRemoteAddr()获取IP地址
+     * 如果使用了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP地址，X-Forwarded-For中第一个非unknown的有效IP字符串，则为真实IP地址
+     */
+    public static String getIpAddr(HttpServletRequest request) {
+        if (request == null) {
+            return "unknown";
+        }
+        String ip = request.getHeader("x-forwarded-for");
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("X-Forwarded-For");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("X-Real-IP");
+        }
+
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+
+        return "0:0:0:0:0:0:0:1".equals(ip) ? LOCAL_IP : ip;
+    }
+
+    public static boolean internalIp(String ip) {
+        boolean res = false;
+        byte[] addr = textToNumericFormatV4(ip);
+        if (addr != null && ip != null) {
+            res = internalIp(addr) || LOCAL_IP.equals(ip);
+        }
+        return res;
+    }
+
+    private static boolean internalIp(byte[] addr) {
+        final byte b0 = addr[0];
+        final byte b1 = addr[1];
+        // 10.x.x.x/8
+        final byte SECTION_1 = 0x0A;
+        // 172.16.x.x/12
+        final byte SECTION_2 = (byte) 0xAC;
+        final byte SECTION_3 = (byte) 0x10;
+        final byte SECTION_4 = (byte) 0x1F;
+        // 192.168.x.x/16
+        final byte SECTION_5 = (byte) 0xC0;
+        final byte SECTION_6 = (byte) 0xA8;
+        boolean flag = false;
+        switch (b0) {
+            case SECTION_1:
+                flag = true;
+                break;
+            case SECTION_2:
+                if (b1 >= SECTION_3 && b1 <= SECTION_4) {
+                    flag = true;
+                }
+                break;
+            case SECTION_5:
+                if (b1 == SECTION_6) {
+                    flag = true;
+                }
+                break;
+            default:
+                break;
+        }
+        return flag;
+    }
+
+    /**
+     * 将IPv4地址转换成字节
+     *IPv4地址
+     * @param text
+     * @return byte 字节
+     */
+    public static byte[] textToNumericFormatV4(String text) {
+        if (text.length() == 0) {
+            return null;
+        }
+
+        byte[] bytes = new byte[4];
+        String[] elements = text.split("\\.", -1);
+        try {
+            long l;
+            int i;
+            switch (elements.length) {
+                case 1:
+                    l = Long.parseLong(elements[0]);
+                    if ((l < 0L) || (l > 4294967295L))
+                        return null;
+                    bytes[0] = (byte) (int) (l >> 24 & 0xFF);
+                    bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF);
+                    bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
+                    bytes[3] = (byte) (int) (l & 0xFF);
+                    break;
+                case 2:
+                    l = Integer.parseInt(elements[0]);
+                    if ((l < 0L) || (l > 255L))
+                        return null;
+                    bytes[0] = (byte) (int) (l & 0xFF);
+                    l = Integer.parseInt(elements[1]);
+                    if ((l < 0L) || (l > 16777215L))
+                        return null;
+                    bytes[1] = (byte) (int) (l >> 16 & 0xFF);
+                    bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
+                    bytes[3] = (byte) (int) (l & 0xFF);
+                    break;
+                case 3:
+                    for (i = 0; i < 2; ++i) {
+                        l = Integer.parseInt(elements[i]);
+                        if ((l < 0L) || (l > 255L))
+                            return null;
+                        bytes[i] = (byte) (int) (l & 0xFF);
+                    }
+                    l = Integer.parseInt(elements[2]);
+                    if ((l < 0L) || (l > 65535L))
+                        return null;
+                    bytes[2] = (byte) (int) (l >> 8 & 0xFF);
+                    bytes[3] = (byte) (int) (l & 0xFF);
+                    break;
+                case 4:
+                    for (i = 0; i < 4; ++i) {
+                        l = Integer.parseInt(elements[i]);
+                        if ((l < 0L) || (l > 255L))
+                            return null;
+                        bytes[i] = (byte) (int) (l & 0xFF);
+                    }
+                    break;
+                default:
+                    return null;
+            }
+        } catch (NumberFormatException e) {
+            log.error("数字格式化异常",e);
+            return null;
+        }
+        return bytes;
+    }
+
+    public static String getLocalIP() {
+        String ip = "";
+        if (System.getProperty("os.name").toLowerCase().startsWith("windows")) {
+            InetAddress addr;
+            try {
+                addr = InetAddress.getLocalHost();
+                ip = addr.getHostAddress();
+            } catch (UnknownHostException e) {
+                log.error("获取失败",e);
+            }
+            return ip;
+        } else {
+            try {
+                Enumeration<?> e1 = (Enumeration<?>) NetworkInterface
+                        .getNetworkInterfaces();
+                while (e1.hasMoreElements()) {
+                    NetworkInterface ni = (NetworkInterface) e1.nextElement();
+                    if (!ni.getName().equals("eth0")) {
+                        continue;
+                    } else {
+                        Enumeration<?> e2 = ni.getInetAddresses();
+                        while (e2.hasMoreElements()) {
+                            InetAddress ia = (InetAddress) e2.nextElement();
+                            if (ia instanceof Inet6Address)
+                                continue;
+                            ip = ia.getHostAddress();
+                            return ip;
+                        }
+                        break;
+                    }
+                }
+            } catch (SocketException e) {
+                log.error("获取失败",e);
+            }
+        }
+        return "";
+    }
+}

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

@@ -0,0 +1,70 @@
+package com.yunzhi.nanyang.common;
+
+import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
+import com.github.binarywang.wxpay.bean.request.WxPayRefundV3Request;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request;
+import com.github.binarywang.wxpay.bean.result.WxPayRefundV3Result;
+import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result;
+import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
+import com.github.binarywang.wxpay.constant.WxPayConstants;
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.yunzhi.nanyang.config.WeixinConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+
+@Component
+public class WxPayUtils {
+    @Autowired
+    WeixinConfig config;
+
+    @Autowired
+    WxUtils wxUtils;
+
+    @Value("${yz.default.servBase}")
+    String servBase;
+
+    /**
+     * 下单
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    public WxPayUnifiedOrderV3Result.JsapiResult createOrder(WxPayUnifiedOrderV3Request request) throws WxPayException {
+        // 北京时间
+        LocalDateTime now = LocalDateTime.now(ZoneOffset.ofHours(8));
+        WxPayService payService = wxUtils.getPayService();
+
+        request.setNotifyUrl(servBase + "/wxpay/notify/order");
+
+        WxPayUnifiedOrderV3Result wxPayUnifiedOrderV3Result = payService.unifiedOrderV3(TradeTypeEnum.JSAPI, request);
+        return wxPayUnifiedOrderV3Result.getPayInfo(TradeTypeEnum.JSAPI, request.getAppid(), request.getMchid(), payService.getConfig().getPrivateKey());
+    }
+
+    /**
+     * 订单退款
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    public WxPayRefundV3Result refund(WxPayRefundV3Request request) throws Exception {
+        WxPayService payService = wxUtils.getPayService();
+
+        request.setNotifyUrl(servBase + "/wxpay/notify/refund");
+        WxPayRefundV3Result result = payService.refundV3(request);
+
+        if ("ABNORMAL".equals(result.getStatus())) {
+            throw new Exception("退款异常");
+        }
+        if ("CLOSED".equals(result.getStatus())) {
+            throw new Exception("退款关闭");
+        }
+
+        return result;
+    }
+
+}

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

@@ -3,6 +3,10 @@ package com.yunzhi.nanyang.common;
 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.nanyang.config.WeixinConfig;
 import com.yunzhi.nanyang.entity.SysMiniapp;
 import com.yunzhi.nanyang.service.ISysMiniappService;
@@ -11,21 +15,27 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class WxUtils {
+    //
+    private final WeixinConfig config;
     // 农机手小程序
     private static WxMaService workerService;
     // 农户小程序
     private static WxMaService farmerService;
+    // 微信支付
+    private static WxPayService payService;
 
     // 此处不能使用变量注入方式, 否则会是 null
     ISysMiniappService iSysMiniappService;
 
     @Autowired
-    public WxUtils(ISysMiniappService iSysMiniappService) {
+    public WxUtils(ISysMiniappService iSysMiniappService, WeixinConfig config) {
         this.iSysMiniappService = iSysMiniappService;
+        this.config = config;
 
         try {
             setWorkerService();
             setFarmerService();
+            setPayService();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -81,4 +91,32 @@ public class WxUtils {
         service.setWxMaConfig(conf);
         return service;
     }
+
+    public WxPayService getPayService() {
+        if (payService == null) {
+            setPayService();
+        }
+
+        return payService;
+    }
+
+    private void setPayService() {
+        WxPayConfig payConfig = new WxPayConfig();
+        payConfig.setAppId(config.getPay().getAppId());
+        payConfig.setMchId(config.getPay().getMchId());
+        payConfig.setMchKey(config.getPay().getMchKey());
+        payConfig.setSubAppId(config.getPay().getSubAppId());
+        payConfig.setSubMchId(config.getPay().getSubMchId());
+        payConfig.setKeyPath(config.getPay().getKeyPath());
+        payConfig.setApiV3Key(config.getPay().getApiV3Key());
+        payConfig.setPrivateKeyPath(config.getPay().getPrivateKeyPath());
+        payConfig.setPrivateCertPath(config.getPay().getPrivateCertPath());
+        // 固定小程序支付
+        payConfig.setTradeType(WxPayConstants.TradeType.JSAPI);
+        // 可以指定是否使用沙箱环境
+        payConfig.setUseSandboxEnv(false);
+
+        payService = new WxPayServiceImpl();
+        payService.setConfig(payConfig);
+    }
 }

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

@@ -10,15 +10,31 @@ import org.springframework.stereotype.Component;
 @ConfigurationProperties(prefix = "weixin")
 public class WeixinConfig {
 
+//    @NestedConfigurationProperty
+//    private Miniapp miniapp = new Miniapp();
+
     @NestedConfigurationProperty
-    private Miniapp miniapp = new Miniapp();
+    private Pay pay = new Pay();
+
+//    @Data
+//    public static class Miniapp {
+//        private String appid;
+//        private String secret;
+//        private String token;
+//        private String aesKey;
+//        private String msgDataFormat;
+//    }
 
     @Data
-    public static class Miniapp {
-        private String appid;
-        private String secret;
-        private String token;
-        private String aesKey;
-        private String msgDataFormat;
+    public static class Pay {
+        private String appId;
+        private String mchId;
+        private String mchKey;
+        private String subAppId;
+        private String subMchId;
+        private String apiV3Key;
+        private String keyPath;
+        private String privateKeyPath;
+        private String privateCertPath;
     }
 }

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

@@ -75,6 +75,7 @@ public class TaDispatchController extends BaseController {
                                        @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @ApiParam("机构") @RequestParam(value ="orgId", required = false) String orgId,
                                        @ApiParam("农机") @RequestParam(value ="machineryId", required = false) String machineryId,
+                                       @ApiParam("农机类型") @RequestParam(value ="typeId", required = false) String typeId,
                                        @ApiParam(value = "预约开始", example = "2022-03-01") @RequestParam(value ="startDate",required = false) String startDate,
                                        @ApiParam(value = "预约结束", example = "2022-03-31") @RequestParam(value ="endDate",required = false) String endDate,
                                        @ApiParam("手机号") @RequestParam(value ="phone",required = false) String phone,
@@ -87,12 +88,12 @@ public class TaDispatchController extends BaseController {
             }
         }
 
-        IPage<TaDispatch> pg = new Page<>(pageNum, pageSize);
+        IPage<TaOrder> pg = new Page<>(pageNum, pageSize);
 
         LocalDateTime start = DateUtils.getDayStart(startDate);
         LocalDateTime end = DateUtils.getDayEnd(endDate);
 
-        IPage<TaDispatch> result = iTaDispatchService.getPageBy(pg, orgId, machineryId, start, end, phone, status);
+        IPage<TaOrder> result = iTaDispatchService.getPageBy(pg, orgId, typeId, machineryId, start, end, phone, status);
         return ResponseBean.success(result);
     }
 

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

@@ -74,23 +74,15 @@ public class TaMachineryController extends BaseController {
         SysUser sysUser = currentUser();
         boolean isAdmin = Constants.ADMIN_ID.equals(sysUser.getUserId());
 
-        if (!StringUtils.isEmpty(orgId)) {
+        if (!StringUtils.isEmpty(orgId) && !isAdmin) {
             if (!checkOrgAccess(orgId, sysUser.getUserId())) {
                 return ResponseBean.error("无权限操作");
             }
         }
 
         IPage<TaMachinery> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaMachinery> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(!StringUtils.isEmpty(name), "name", "%" + name + "%");
-        queryWrapper.eq(!StringUtils.isEmpty(typeId), "type_id", typeId);
-        queryWrapper.in(!isAdmin, "org_id", getAccessOrgs(sysUser.getUserId()));
-        queryWrapper.eq(!StringUtils.isEmpty(orgId), "org_id", orgId);
-        queryWrapper.gt("status", Constants.STATUS_DELETE);
-        queryWrapper.eq(null != status, "status", status);
-        queryWrapper.orderByDesc("create_date");
-
-        IPage<TaMachinery> result = iTaMachineryService.page(pg, queryWrapper);
+
+        IPage<TaMachinery> result = iTaMachineryService.getPageBy(pg, name, typeId, orgId, status);
         return ResponseBean.success(result);
     }
 

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

@@ -3,10 +3,8 @@ 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.Constants;
-import com.yunzhi.nanyang.common.ResponseBean;
-import com.yunzhi.nanyang.common.StringUtils;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request;
+import com.yunzhi.nanyang.common.*;
 import com.yunzhi.nanyang.entity.*;
 import com.yunzhi.nanyang.service.*;
 import io.swagger.annotations.Api;
@@ -22,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 订单表 前端控制器
@@ -53,6 +53,9 @@ public class TaOrderController extends BaseController {
     @Autowired
     public ITaMachineryService iTaMachineryService;
 
+    @Autowired
+    public ITaPayService iTaPayService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -62,12 +65,27 @@ public class TaOrderController extends BaseController {
     @RequestMapping(value="/admin/order",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                @ApiParam("机构") @RequestParam(value ="orgId", required = false) String orgId,
+                                @ApiParam("农机") @RequestParam(value ="machineryId", required = false) String machineryId,
+                                @ApiParam("类型") @RequestParam(value ="typeId", required = false) String typeId,
+                                @ApiParam("下单人") @RequestParam(value ="personName", required = false) String personName,
+                                @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
+                                @ApiParam("付款状态") @RequestParam(value ="payStatus", required = false) Integer payStatus,
+                                @ApiParam("调度状态") @RequestParam(value ="dispatchStatus", required = false) Integer dispatchStatus,
+                                @ApiParam("作业状态") @RequestParam(value ="workStatus", required = false) Integer workStatus,
+                                @ApiParam("评价状态") @RequestParam(value ="isEvaluated", required = false) Integer isEvaluated) throws Exception{
         SysUser current = currentUser();
         boolean isAdmin = Constants.ADMIN_ID.equals(current.getUserId());
-        IPage<TaOrder> pg = new Page<>(pageNum, pageSize);
 
-        IPage<TaOrder> result = iTaOrderService.getAdminPage(pg, isAdmin ? null : current);
+        if (!isAdmin && !StringUtils.isEmpty(orgId)) {
+            if (!checkOrgAccess(orgId, current.getUserId())) {
+                return ResponseBean.error("无机构查询权限");
+            }
+        }
+
+        IPage<TaOrder> pg = new Page<>(pageNum, pageSize);
+        IPage<TaOrder> result = iTaOrderService.getAdminPage(pg, isAdmin ? null : current, orgId, machineryId, typeId, personName, phone, payStatus, dispatchStatus, workStatus, isEvaluated);
         return ResponseBean.success(result);
     }
 
@@ -118,7 +136,8 @@ public class TaOrderController extends BaseController {
     @ApiOperation(value="生成订单", notes = "生成订单", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taOrderAdd(@ApiParam("客户端") @PathVariable String client,
                                    @ApiParam("客户端ID") @PathVariable String clientId,
-                                   @ApiParam("保存内容") @RequestBody TaOrder taOrder) throws Exception{
+                                   @ApiParam("保存内容") @RequestBody TaOrder taOrder,
+                                   HttpServletRequest request) throws Exception{
         TaPerson taPerson = currentPerson();
 
         String orderNo = iTaOrderService.getNextOrderNO();

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

@@ -0,0 +1,78 @@
+package com.yunzhi.nanyang.controller;
+
+import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result;
+import com.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.Constants;
+import com.yunzhi.nanyang.common.ResponseBean;
+import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.entity.TaOrder;
+import com.yunzhi.nanyang.service.ITaOrderService;
+import com.yunzhi.nanyang.service.ITaPayService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Api(tags = "支付")
+@RestController
+@RequestMapping("/")
+public class TaPayController extends BaseController {
+
+    @Autowired
+    ITaPayService iTaPayService;
+
+    @Autowired
+    public ITaOrderService iTaOrderService;
+
+    @RequestMapping(value="/{client}/{clientId}/order/{id}/prepay",method= RequestMethod.POST)
+    @ApiOperation(value="预支付", notes = "预支付", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean prepay(@ApiParam("客户端") @PathVariable String client,
+                               @ApiParam("客户端ID") @PathVariable String clientId,
+                               @ApiParam("订单ID") @PathVariable String id,
+                               @ApiParam("支付相关") @RequestBody TaOrder payOrder) throws Exception{
+        if (null == payOrder || StringUtils.isEmpty(payOrder.getPayType())) {
+            return ResponseBean.error("请选择支付方式");
+        }
+
+        TaOrder taOrder = iTaOrderService.getExistBy("order_id", id, false, true);
+        if (null == taOrder) {
+            return ResponseBean.error("未找到订单信息");
+        }
+
+        // 设置支付方式
+        taOrder.setPayType(payOrder.getPayType());
+
+        if (taOrder.getPayStatus() != Constants.PAY_READY) {
+            return ResponseBean.error("订单已支付");
+        }
+
+        WxPayUnifiedOrderV3Result.JsapiResult result = iTaPayService.createPay(client, clientId, taOrder);
+        return ResponseBean.success(result);
+    }
+
+
+    @RequestMapping(value="/{client}/{clientId}/order/{id}/refund",method= RequestMethod.PUT)
+    @ApiOperation(value="申请退款", notes = "申请退款", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean refund(@ApiParam("客户端") @PathVariable String client,
+                               @ApiParam("客户端ID") @PathVariable String clientId,
+                               @ApiParam("订单ID") @PathVariable String id) throws Exception{
+        TaOrder taOrder = iTaOrderService.getExistBy("order_id", id, false, true);
+        if (null == taOrder) {
+            return ResponseBean.error("未找到订单信息");
+        }
+
+        if (taOrder.getPayStatus() != Constants.PAY_PAID) {
+            return ResponseBean.error("订单未支付");
+        }
+        if (taOrder.getWorkStatus() != Constants.WORK_READY) {
+            return ResponseBean.error("订单已作业, 不能退款");
+        }
+
+        iTaPayService.refund(client, clientId, taOrder);
+        return ResponseBean.success("success");
+    }
+}

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

@@ -107,6 +107,15 @@ public class TaWorkJobController extends BaseController {
             return ResponseBean.error("非工作状态, 不能操作");
         }
 
+        TaOrder taOrder = iTaOrderService.getExistBy("order_id", taWorkJob.getOrderId(), false, true);
+        if (taOrder == null) {
+            return ResponseBean.error("校验订单失败");
+        }
+
+        if (Constants.PAY_PAID != taOrder.getPayStatus()) {
+            return ResponseBean.error("订单未支付或者已退款");
+        }
+
 //        int status = mode ? Constants.WORK_DOING : Constants.WORK_PAUSE;
         int status = Constants.WORK_DOING;
 

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

@@ -0,0 +1,48 @@
+package com.yunzhi.nanyang.controller;
+
+import com.github.binarywang.wxpay.bean.notify.*;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.yunzhi.nanyang.common.BaseController;
+import com.yunzhi.nanyang.common.WxUtils;
+import com.yunzhi.nanyang.service.ITaPayService;
+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
+    ITaPayService orderPayService;
+
+    @ResponseBody
+    @RequestMapping("/notify/order")
+    public String payNotify(@RequestBody String jsonData) throws Exception {
+        WxPayService payService = wxUtils.getPayService();
+        WxPayOrderNotifyV3Result result = payService.parseOrderNotifyV3Result(jsonData, null);
+
+        orderPayService.notifyOrder(result.getResult());
+
+        return WxPayNotifyResponse.success("OK");
+    }
+
+    @ResponseBody
+    @RequestMapping("/notify/refund")
+    public String refundNotify(@RequestBody String jsonData) throws Exception {
+        WxPayService payService = wxUtils.getPayService();
+        WxPayRefundNotifyV3Result result = payService.parseRefundNotifyV3Result(jsonData, null);
+
+        orderPayService.refundNotifyOrder(result.getResult());
+
+        return WxPayNotifyResponse.success("OK");
+    }
+
+}

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

@@ -73,6 +73,10 @@ public class TaMachinery implements Serializable {
     @ApiModelProperty(value = "机构ID")
     private String orgId;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "机构名称")
+    private String orgName;
+
     @ApiModelProperty(value = "工作状态")
     private String jobStatus;
 

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

@@ -90,6 +90,9 @@ public class TaOrder implements Serializable {
     @ApiModelProperty(value = "是否评价")
     private Integer isEvaluated;
 
+    @ApiModelProperty(value = "支付端")
+    private String payType;
+
     @ApiModelProperty(value = "是否退单")
     private Integer isRefund;
 

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

@@ -3,6 +3,8 @@ package com.yunzhi.nanyang.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.time.LocalDateTime;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -25,8 +27,41 @@ public class TaPay implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty(value = "轮播图Id")
-	@TableId(value = "id", type = IdType.INPUT)
-	private String id;
+	@ApiModelProperty(value = "支付ID")
+	@TableId(value = "pay_id", type = IdType.INPUT)
+	private String payId;
+
+	@ApiModelProperty(value = "订单ID")
+	private String orderId;
+
+	@ApiModelProperty(value = "订单号")
+	private String orderNo;
+
+	@ApiModelProperty(value = "支付人")
+	private String personId;
+
+	@ApiModelProperty(value = "支付类型")
+	private String payType;
+
+	@ApiModelProperty(value = "是否退款")
+	private Boolean isRefund;
+
+	@ApiModelProperty(value = "支付结果描述")
+	private String message;
+
+	@ApiModelProperty(value = "支付金额;单位分")
+	private Integer charges;
+
+	@ApiModelProperty(value = "商品描述")
+	private String description;
+
+	@ApiModelProperty(value = "状态")
+	private Integer status;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createDate;
+
+	@ApiModelProperty(value = "支付时间")
+	private LocalDateTime payDate;
 
 }

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

@@ -3,6 +3,7 @@ package com.yunzhi.nanyang.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaDispatch;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.nanyang.entity.TaOrder;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,11 +20,12 @@ import java.time.LocalDateTime;
 @Mapper
 public interface TaDispatchMapper extends BaseMapper<TaDispatch> {
 
-    IPage<TaDispatch> getPageBy(IPage<TaDispatch> pg,
-                                @Param("orgId") String orgId,
-                                @Param("machineryId") String machineryId,
-                                @Param("start") LocalDateTime start,
-                                @Param("end") LocalDateTime end,
-                                @Param("phone") String phone,
-                                @Param("status") String status);
+    IPage<TaOrder> getPageBy(IPage<TaOrder> pg,
+                             @Param("orgId") String orgId,
+                             @Param("typeId") String typeId,
+                             @Param("machineryId") String machineryId,
+                             @Param("start") LocalDateTime start,
+                             @Param("end") LocalDateTime end,
+                             @Param("phone") String phone,
+                             @Param("status") String status);
 }

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

@@ -36,4 +36,10 @@ public interface TaMachineryMapper extends BaseMapper<TaMachinery> {
                                         @Param("location") String location,
                                         @Param("typeId") String typeId,
                                         @Param("q") String q);
+
+    IPage<TaMachinery> getPageBy(IPage<TaMachinery> pg,
+                                 @Param("name") String name,
+                                 @Param("typeId") String typeId,
+                                 @Param("orgId") String orgId,
+                                 @Param("status") Integer status);
 }

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

@@ -23,7 +23,17 @@ public interface TaOrderMapper extends BaseMapper<TaOrder> {
     @Select("SELECT fn_nextval(#{name})")
     int getNextOrderNO(@Param("name") String name);
 
-    IPage<TaOrder> getAdminPage(IPage<TaOrder> pg, @Param("userId") String userId);
+    IPage<TaOrder> getAdminPage(IPage<TaOrder> pg,
+                                @Param("userId") String userId,
+                                @Param("orgId") String orgId,
+                                @Param("machineryId") String machineryId,
+                                @Param("typeId") String typeId,
+                                @Param("personName") String personName,
+                                @Param("phone") String phone,
+                                @Param("payStatus") Integer payStatus,
+                                @Param("dispatchStatus") Integer dispatchStatus,
+                                @Param("workStatus") Integer workStatus,
+                                @Param("isEvaluated") Integer isEvaluated);
 
     IPage<TaOrder> getClientPage(IPage<TaOrder> pg,
                                  @Param("personId") String personId,
@@ -35,4 +45,6 @@ public interface TaOrderMapper extends BaseMapper<TaOrder> {
                                       @Param("q") String q);
 
     List<TaOrder> checkMachineryDuty(@Param("machineryId") String machineryId,@Param("appointmentDate") String appointmentDate);
+
+    int updatePayStatus(@Param("orderId") String orderId, @Param("payStatus") int payStatus);
 }

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

@@ -0,0 +1,9 @@
+package com.yunzhi.nanyang.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.nanyang.entity.TaPay;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaPayMapper extends BaseMapper<TaPay> {
+}

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

@@ -3,6 +3,7 @@ package com.yunzhi.nanyang.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaDispatch;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.nanyang.entity.TaOrder;
 
 import java.time.LocalDateTime;
 
@@ -16,5 +17,5 @@ import java.time.LocalDateTime;
  */
 public interface ITaDispatchService extends IBaseService<TaDispatch> {
 
-    IPage<TaDispatch> getPageBy(IPage<TaDispatch> pg, String orgId, String machineryId, LocalDateTime start, LocalDateTime end, String phone, String status);
+    IPage<TaOrder> getPageBy(IPage<TaOrder> pg, String orgId, String typeId, String machineryId, LocalDateTime start, LocalDateTime end, String phone, String status);
 }

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

@@ -29,4 +29,6 @@ public interface ITaMachineryService extends IBaseService<TaMachinery> {
     MachineSummary getSummaryDetail(String machineryId, String location, Boolean attached);
 
     boolean updateStatus(String machineryId, String statusColumn, int statusValue);
+
+    IPage<TaMachinery> getPageBy(IPage<TaMachinery> pg, String name, String typeId, String orgId, Integer status);
 }

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

@@ -19,7 +19,7 @@ public interface ITaOrderService extends IBaseService<TaOrder> {
 
     String getNextOrderNO();
 
-    IPage<TaOrder> getAdminPage(IPage<TaOrder> pg, SysUser sysUser);
+    IPage<TaOrder> getAdminPage(IPage<TaOrder> pg, SysUser sysUser, String orgId, String machineryId, String typeId, String personName, String phone, Integer payStatus, Integer dispatchStatus, Integer workStatus, Integer isEvaluated);
 
     IPage<TaOrder> getClientPage(IPage<TaOrder> pg, TaPerson taPerson, SysUser sysUser, Integer workStatus, String q);
 

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

@@ -0,0 +1,22 @@
+package com.yunzhi.nanyang.service;
+
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result;
+import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyV3Result;
+import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result;
+import com.yunzhi.nanyang.entity.TaOrder;
+import com.yunzhi.nanyang.entity.TaPay;
+
+public interface ITaPayService extends IBaseService<TaPay> {
+
+    WxPayUnifiedOrderV3Result.JsapiResult createPay(String client, String clientId, TaOrder taOrder) throws Exception;
+
+    WxPayUnifiedOrderV3Result.JsapiResult prePay(TaPay taPay) throws Exception;
+
+    TaPay getByOrderNo(String orderNo);
+
+    void notifyOrder(WxPayOrderNotifyV3Result.DecryptNotifyResult result);
+
+    void refund(String client, String clientId, TaOrder taOrder) throws Exception;
+
+    void refundNotifyOrder(WxPayRefundNotifyV3Result.DecryptNotifyResult result);
+}

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

@@ -2,9 +2,9 @@ package com.yunzhi.nanyang.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaDispatch;
+import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.mapper.TaDispatchMapper;
 import com.yunzhi.nanyang.service.ITaDispatchService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
 public class TaDispatchServiceImpl extends BaseServiceImpl<TaDispatchMapper, TaDispatch> implements ITaDispatchService {
 
     @Override
-    public IPage<TaDispatch> getPageBy(IPage<TaDispatch> pg, String orgId, String machineryId, LocalDateTime start, LocalDateTime end, String phone, String status) {
-        return baseMapper.getPageBy(pg, orgId, machineryId, start, end, phone, status);
+    public IPage<TaOrder> getPageBy(IPage<TaOrder> pg, String orgId, String typeId, String machineryId, LocalDateTime start, LocalDateTime end, String phone, String status) {
+        return baseMapper.getPageBy(pg, orgId, typeId, machineryId, start, end, phone, status);
     }
 }

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

@@ -134,6 +134,11 @@ public class TaMachineryServiceImpl extends BaseServiceImpl<TaMachineryMapper, T
         return update(updateWrapper);
     }
 
+    @Override
+    public IPage<TaMachinery> getPageBy(IPage<TaMachinery> pg, String name, String typeId, String orgId, Integer status) {
+        return baseMapper.getPageBy(pg, name, typeId, orgId, status);
+    }
+
     private void saveImages(TaMachinery taMachinery) {
         String machineryId = taMachinery.getMachineryId();
         // 先删除所有

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

@@ -35,9 +35,9 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
     }
 
     @Override
-    public IPage<TaOrder> getAdminPage(IPage<TaOrder> pg, SysUser sysUser) {
+    public IPage<TaOrder> getAdminPage(IPage<TaOrder> pg, SysUser sysUser, String orgId, String machineryId, String typeId, String personName, String phone, Integer payStatus, Integer dispatchStatus, Integer workStatus, Integer isEvaluated) {
 
-        return baseMapper.getAdminPage(pg, null == sysUser ? null : sysUser.getUserId());
+        return baseMapper.getAdminPage(pg, null == sysUser ? null : sysUser.getUserId(), orgId, machineryId, typeId, personName, phone, payStatus, dispatchStatus, workStatus, isEvaluated);
     }
 
     @Override

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

@@ -0,0 +1,231 @@
+package com.yunzhi.nanyang.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result;
+import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyV3Result;
+import com.github.binarywang.wxpay.bean.request.WxPayRefundV3Request;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request;
+import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result;
+import com.github.binarywang.wxpay.constant.WxPayConstants;
+import com.github.binarywang.wxpay.constant.WxPayErrorCode;
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.yunzhi.nanyang.common.Constants;
+import com.yunzhi.nanyang.common.DateUtils;
+import com.yunzhi.nanyang.common.StringUtils;
+import com.yunzhi.nanyang.common.WxPayUtils;
+import com.yunzhi.nanyang.entity.TaOrder;
+import com.yunzhi.nanyang.entity.TaPay;
+import com.yunzhi.nanyang.mapper.TaOrderMapper;
+import com.yunzhi.nanyang.mapper.TaPayMapper;
+import com.yunzhi.nanyang.mapper.TaPersonMapper;
+import com.yunzhi.nanyang.service.ITaPayService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+@Slf4j
+@Service
+public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implements ITaPayService {
+
+
+    @Autowired
+    TaPersonMapper taPersonMapper;
+
+    @Autowired
+    TaOrderMapper taOrderMapper;
+
+    @Autowired
+    WxPayUtils wxPayUtils;
+
+    @Override
+    public WxPayUnifiedOrderV3Result.JsapiResult createPay(String client, String clientId, TaOrder taOrder) throws Exception {
+        TaPay taPay = getByOrderNo(taOrder.getOrderNo());
+        if (null == taPay) {
+            taPay = new TaPay();
+            taPay.setOrderId(taOrder.getOrderId());
+            taPay.setOrderNo(taOrder.getOrderNo());
+            taPay.setPersonId(taOrder.getPersonId());
+            taPay.setCharges(taOrder.getCharges());
+
+            if (taOrder.getTypeName().length() > 127) {
+                taPay.setDescription(taOrder.getTypeName().substring(0, 127));
+            } else {
+                taPay.setDescription(taOrder.getTypeName());
+            }
+
+            taPay.setPayType(taOrder.getPayType());
+            taPay.setStatus(Constants.PAY_READY);
+        }
+
+        try {
+            WxPayUnifiedOrderV3Result.JsapiResult jsapiResult = prePay(taPay);
+            if (StringUtils.isEmpty(taPay.getPayId())) {
+                taPay.setPayId(StringUtils.uuid());
+                if (!save(taPay)) {
+                    throw new Exception("系统出错请重试");
+                }
+            }
+            return jsapiResult;
+        } catch (WxPayException e) {
+            e.printStackTrace();
+
+            boolean isPaid = WxPayErrorCode.UnifiedOrder.ORDERPAID.equals(e.getErrCode());
+            if (isPaid) {
+                // 如果订单已支付
+                taPay.setStatus(Constants.PAY_PAID);
+                taPay.setPayDate(LocalDateTime.now());
+                if (StringUtils.isEmpty(taPay.getPayId())) {
+                    taPay.setPayId(StringUtils.uuid());
+                    if (!save(taPay)) {
+                        throw new Exception("系统出错请重试");
+                    }
+                } else {
+                    updateById(taPay);
+                }
+                taOrderMapper.updatePayStatus(taPay.getOrderId(), Constants.PAY_PAID);
+            }
+
+            throw e;
+        }
+    }
+
+    @Override
+    public WxPayUnifiedOrderV3Result.JsapiResult prePay(TaPay taPay) throws WxPayException {
+        // 生成订单
+        if ("wx".equals(taPay.getPayType())) {
+            WxPayUnifiedOrderV3Request.Amount amount = new  WxPayUnifiedOrderV3Request.Amount();
+            amount.setTotal(taPay.getCharges());
+
+            WxPayUnifiedOrderV3Request.Payer payer = new WxPayUnifiedOrderV3Request.Payer();
+            payer.setOpenid(taPersonMapper.selectById(taPay.getPersonId()).getOpenid());
+
+            WxPayUnifiedOrderV3Request req = new WxPayUnifiedOrderV3Request();
+            req.setDescription(taPay.getDescription());
+            req.setOutTradeNo(taPay.getOrderNo());
+            req.setAmount(amount);
+            req.setPayer(payer);
+
+            return wxPayUtils.createOrder(req);
+        }
+
+        return null;
+    }
+
+    @Override
+    public TaPay getByOrderNo(String orderNo) {
+        QueryWrapper<TaPay> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("order_no", orderNo);
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+
+        return getOne(queryWrapper);
+    }
+
+    @Override
+    public void notifyOrder(WxPayOrderNotifyV3Result.DecryptNotifyResult result) {
+        TaPay orderPay = getByOrderNo(result.getOutTradeNo());
+        if (orderPay.getStatus() != Constants.PAY_READY) {
+            return;
+        }
+
+        boolean isSuccess = WxPayConstants.ResultCode.SUCCESS.equals(result.getTradeState());
+
+        orderPay.setPayDate(DateUtils.from(result.getSuccessTime(), DateTimeFormatter.ISO_DATE_TIME));
+        orderPay.setStatus(isSuccess ? Constants.PAY_PAID : Constants.PAY_FAIL);
+        orderPay.setMessage(isSuccess ? null : result.getTradeStateDesc());
+        baseMapper.updateById(orderPay);
+
+        // 更新订单状态
+        if (isSuccess) {
+            taOrderMapper.updatePayStatus(orderPay.getOrderId(), Constants.PAY_PAID);
+        }
+
+        // 插入账户流水
+        // 暂无
+    }
+
+    @Override
+    public void refund(String client, String clientId, TaOrder taOrder) throws Exception {
+        TaPay origin = getByOrderNo(taOrder.getOrderNo());
+        if (null == origin) {
+            throw new Exception("未找到支付信息");
+        }
+
+        if (origin.getStatus() != Constants.PAY_PAID) {
+            throw new Exception("订单支付校验失败");
+        }
+
+        String refundNo = "R-"+origin.getOrderNo();
+        TaPay taPay = getByOrderNo(refundNo);
+        if (null == taPay) {
+            taPay = new TaPay();
+            taPay.setOrderId(taOrder.getOrderId());
+            taPay.setOrderNo(refundNo);
+            taPay.setPersonId(taOrder.getPersonId());
+            taPay.setCharges(taOrder.getCharges());
+            taPay.setIsRefund(true);
+            taPay.setDescription("退款");
+            taPay.setPayType(taOrder.getPayType());
+            taPay.setStatus(Constants.PAY_READY);
+        }
+
+        WxPayRefundV3Request request = new WxPayRefundV3Request();
+        request.setOutTradeNo(origin.getOrderNo()); // 原单号
+        request.setOutRefundNo(taPay.getOrderNo()); // 退款单号
+        WxPayRefundV3Request.Amount amount = new  WxPayRefundV3Request.Amount();
+        amount.setTotal(taPay.getCharges());
+        amount.setRefund(taPay.getCharges());
+        amount.setCurrency("CNY");
+        request.setAmount(amount);
+
+        wxPayUtils.refund(request);
+        if (StringUtils.isEmpty(taPay.getPayId())) {
+            // 退款申请中 ...
+            taOrder.setPayStatus(Constants.PAY_REFUNDING);
+            taOrderMapper.updateById(taOrder);
+
+            taPay.setPayId(StringUtils.uuid());
+            if (!save(taPay)) {
+                throw new Exception("内部错误, 请重新操作");
+            }
+        }
+    }
+
+    @Override
+    public void refundNotifyOrder(WxPayRefundNotifyV3Result.DecryptNotifyResult result) {
+        TaPay taPay = getByOrderNo(result.getOutRefundNo());
+        if (null == taPay) {
+            log.error("退款通知处理失败: 单号 " + result.getOutRefundNo());
+            log.error(result.toString());
+            return;
+        }
+
+        if (taPay.getStatus() != Constants.PAY_READY) {
+            return;
+        }
+
+        boolean isSuccess = WxPayConstants.RefundStatus.SUCCESS.equals(result.getRefundStatus());
+
+        taPay.setPayDate(DateUtils.from(result.getSuccessTime(), DateTimeFormatter.ISO_DATE_TIME));
+        taPay.setStatus(isSuccess ? Constants.PAY_PAID : Constants.PAY_FAIL);
+        taPay.setMessage(isSuccess ? null : result.getRefundStatus());
+        baseMapper.updateById(taPay);
+
+        // 更新订单状态
+        if (isSuccess) {
+            TaOrder taOrder = taOrderMapper.selectById(taPay.getOrderId());
+            taOrder.setPayStatus(Constants.PAY_REFUND);
+            taOrder.setIsRefund(1);
+            taOrder.setStatus(Constants.ORDER_CANCEL);
+            taOrderMapper.updateById(taOrder);
+        }
+
+        // 插入账户流水
+        // 暂无
+
+    }
+
+
+}

src/main/resources/application.yml

@@ -9,6 +9,7 @@ shiro:
   enabled: true
   unauthorizedUrl: /api/401
   filterRuleMap: '{
+    "/wxpay/notify/**": "anon",
     "/**/sms-captcha": "anon",
     "/admin/login": "anon",
     "/admin/**": "manager",
@@ -35,6 +36,7 @@ sms:
 yz:
   default:
     password: 888888
+    servBase: https://machine.njyunzhi.com/api
   sms:
     ## 可以任意名称
     appid: state-grid-training
@@ -71,6 +73,16 @@ weixin:
     token:
     aesKey:
     msgDataFormat: JSON
+  pay:
+    appId: wx94f23e5b285c046d
+    mchId: 1621038483
+    mchKey: #商户密钥
+    subAppId: #服务商模式下的子商户公众账号ID
+    subMchId: #服务商模式下的子商户号
+    apiV3Key: bRygxYHU7hTzNPixgnKbElhmYQDw1C7r
+    keyPath:
+    privateKeyPath: classpath:cert/apiclient_key.pem
+    privateCertPath: classpath:cert/apiclient_cert.pem
 
 ###
 spring:

src/main/resources/mapper/TaDispatchMapper.xml

@@ -42,10 +42,13 @@
         <if test="end != null">
             AND t.appointment_date &lt;= #{end}
         </if>
+        <if test="typeId != null and typeId != ''">
+            AND s.type_id = #{typeId}
+        </if>
         <if test="machineryId != null and machineryId != ''">
-            AND m.machinery_id = #{machineryId}
+            AND s.machinery_id = #{machineryId}
         </if>
-        <if test="machineryId != null and phone != ''">
+        <if test="phone != null and phone != ''">
             AND m.phone LIKE CONCAT( '%', #{phone}, '%' )
         </if>
         ORDER BY

src/main/resources/mapper/TaMachineryMapper.xml

@@ -65,4 +65,28 @@
         ORDER BY
             distance ASC
     </select>
+    <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TaMachinery">
+        SELECT
+            t.*,
+            m.`name` as org_name
+        FROM
+            ta_machinery t
+            INNER JOIN ta_org m ON m.org_id = t.org_id
+        WHERE
+            t.`status` &gt; -1
+        <if test="name != null and name != ''">
+            AND t.`name` LIKE CONCAT('%', #{name}, '%')
+        </if>
+        <if test="typeId != null and typeId != ''">
+            AND t.type_id = #{typeId}
+        </if>
+        <if test="orgId != null and orgId != ''">
+            AND t.org_id = #{orgId}
+        </if>
+        <if test="status != null">
+            AND t.status = #{status}
+        </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaOrderMapper.xml

@@ -1,11 +1,19 @@
 <?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.TaOrderMapper">
+    <update id="updatePayStatus">
+        UPDATE ta_order
+        SET pay_status = #{payStatus}
+        WHERE
+            order_id = #{orderId}
+    </update>
 
     <select id="getAdminPage" resultType="com.yunzhi.nanyang.entity.TaOrder">
         SELECT DISTINCT
             t.*,
-            m.`name` as org_name
+            m.`name` as org_name,
+            n.nick_name as person_name,
+            n.phone as phone
         FROM
             ta_order t
             <if test="userId != null and userId != ''">
@@ -13,8 +21,36 @@
                 AND s.user_id = #{userId}
             </if>
             INNER JOIN ta_org m ON m.org_id = t.org_id
+            INNER JOIN ta_person n ON n.person_id = t.person_id
         WHERE
-            t.`status` = 1
+            t.`status` &gt; 0
+        <if test="orgId != null and orgId != ''">
+            AND t.org_id = #{orgId}
+        </if>
+        <if test="machineryId != null and machineryId != ''">
+            AND t.machinery_id = #{machineryId}
+        </if>
+        <if test="typeId != null and typeId != ''">
+            AND t.machinery_type = #{typeId}
+        </if>
+        <if test="payStatus != null">
+            AND t.pay_status = #{payStatus}
+        </if>
+        <if test="dispatchStatus != null">
+            AND t.dispatch_status = #{dispatchStatus}
+        </if>
+        <if test="workStatus != null">
+            AND t.work_status = #{workStatus}
+        </if>
+        <if test="isEvaluated != null">
+            AND t.is_evaluated = #{isEvaluated}
+        </if>
+        <if test="personName != null and personName != ''">
+            AND n.nick_name LIKE CONCAT( '%', #{personName}, '%' )
+        </if>
+        <if test="phone != null and phone != ''">
+            AND n.phone LIKE CONCAT( '%', #{phone}, '%' )
+        </if>
         ORDER BY
             t.create_date DESC
     </select>
@@ -29,7 +65,7 @@
             INNER JOIN ta_org m ON m.org_id = t.org_id
             INNER JOIN ta_person n ON n.person_id = t.person_id
         WHERE
-            t.`status` = 1
+            t.`status` &gt; 0
         <if test="personId != null and personId != ''">
             AND t.person_id = #{personId}
         </if>