feats

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

@@ -40,6 +40,7 @@ public class Constants {
     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_PROCESSING = 4;  // 支付中
     public final static int PAY_REFUND = -1;  // 已退款
 
     // 是否调度

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

@@ -84,11 +84,6 @@ public class PayNotifyController extends BaseController {
                             HttpServletRequest request) {
         Map<String, String> params = getRequestParams(request);
 
-        // 支付等待中
-        if ("WAIT_BUYER_PAY".equals(params.get("trade_status"))) {
-            return "success";
-        }
-
         //切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
         //boolean AlipaySignature.rsaCheckV1(Map<String, String> params, String publicKey, String charset, String sign_type)
         try {

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

@@ -96,9 +96,9 @@ public class TaEvaluationController extends BaseController {
             return ResponseBean.error("非法操作");
         }
 
-        if (Constants.PAY_PAID != taOrder.getPayStatus() || Constants.WORK_DONE != taOrder.getWorkStatus()) {
-            return ResponseBean.error("订单未支付或者未完成");
-        }
+//        if (Constants.PAY_PAID != taOrder.getPayStatus() || Constants.WORK_DONE != taOrder.getWorkStatus()) {
+//            return ResponseBean.error("订单未支付或者未完成");
+//        }
 
         taEvaluation.setPersonId(personId);
 

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

@@ -86,19 +86,20 @@ public class TaPayController extends BaseController {
     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");
+        return ResponseBean.error("暂不支持退款操作");
+//        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/TaPersonController.java

@@ -14,13 +14,9 @@ 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.*;
 import com.yunzhi.nanyang.service.ITaPersonService;
 import com.yunzhi.nanyang.entity.TaPerson;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -51,25 +47,26 @@ public class TaPersonController extends BaseController {
     public SMSCaptcha smsCaptcha;
 
 
-//    /**
-//     * 分页查询列表
-//     * @param pageNum
-//     * @param pageSize
-//     * @return
-//     */
-//    @RequestMapping(value="/taPerson",method= RequestMethod.GET)
-//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean taPersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-//
-//		    IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
-//            QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.orderByDesc("create_date");
-//
-//            IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);
-//            return ResponseBean.success(result);
-//    }
-//
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/person",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taPersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("身份") @RequestParam(value ="identity", required = false) String identity,
+                                     @ApiParam("昵称") @RequestParam(value ="nickName", required = false) String nickName,
+                                     @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone) throws Exception{
+
+        IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
+
+        IPage<TaPerson> result = iTaPersonService.getPageBy(pg, identity, nickName, phone);
+        return ResponseBean.success(result);
+    }
+
 //    /**
 //     * 保存对象
 //     * @param taPerson 实体对象

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

@@ -139,9 +139,9 @@ public class TaWorkJobController extends BaseController {
             return ResponseBean.error("校验订单失败");
         }
 
-        if (Constants.PAY_PAID != taOrder.getPayStatus()) {
-            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;
@@ -191,9 +191,22 @@ public class TaWorkJobController extends BaseController {
         origin.setArea(taWorkJob.getArea());
         origin.setEndDate(LocalDateTime.now());
 
-        iTaOrderService.updateStatus(taWorkJob.getOrderId(), "work_status", Constants.WORK_DONE);
+//        iTaOrderService.updateStatus(taWorkJob.getOrderId(), "work_status", Constants.WORK_DONE);
         iTaMachineryService.updateStatus(taWorkJob.getMachineryId(), "job_status", Constants.WORK_DONE);
 
+        // 更新订单
+        TaOrder taOrder = iTaOrderService.getExistBy("order_id", origin.getOrderId(), false, true);
+        if (null == taOrder) {
+            return ResponseBean.error("校验订单失败");
+        }
+
+        int area = StringUtils.isEmpty(taWorkJob.getArea()) ? 0 : Integer.valueOf(taWorkJob.getArea());
+        int charges = taOrder.getPrice() * area;
+        taOrder.setAmount(area);
+        taOrder.setCharges(charges);
+        taOrder.setWorkStatus(Constants.WORK_DONE);
+        iTaOrderService.updateById(taOrder);
+
         if (iTaWorkJobService.updateById(origin)){
             return ResponseBean.success(origin);
         }else {

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

@@ -68,4 +68,8 @@ public class SysUser implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty("登录账号")
     private String loginName;
+
+    @TableField(exist = false)
+    @ApiModelProperty("移动端昵称")
+    private String nickName;
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaPerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yunzhi.nanyang.vo.ChartParam;
@@ -29,4 +30,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     @Select("SELECT * FROM ta_person t WHERE t.phone = #{phone} AND t.identity = #{clientId} AND t.`status` > -1")
     TaPerson getByPhone(@Param("clientId") String clientId,@Param("phone")  String phone);
+
+    IPage<TaPerson> getPageBy(IPage<TaPerson> pg, @Param("identity") String identity, @Param("nickName") String nickName, @Param("phone") String phone);
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.nanyang.vo.ChartParam;
@@ -21,4 +22,6 @@ public interface ITaPersonService extends IBaseService<TaPerson> {
     ChartParam statisTotal();
 
     TaPerson getByPhone(String clientId, String phone);
+
+    IPage<TaPerson> getPageBy(IPage<TaPerson> pg, String identity, String nickName, String phone);
 }

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

@@ -122,9 +122,10 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
     public void notifyOrder(WxPayOrderNotifyV3Result.DecryptNotifyResult result) throws Exception {
         String orderNo = result.getOutTradeNo();
         boolean isSuccess = WxPayConstants.ResultCode.SUCCESS.equals(result.getTradeState());
+        boolean isPaying = WxPayConstants.WxpayTradeStatus.USER_PAYING.equals(result.getTradeState());
         LocalDateTime payTime = DateUtils.from(result.getSuccessTime(), DateTimeFormatter.ISO_DATE_TIME);
         String message = result.getTradeStateDesc();
-        notifyOrder(orderNo, isSuccess, payTime, message);
+        notifyOrder(orderNo, isSuccess, payTime, message, isPaying);
     }
 
     @Override
@@ -132,17 +133,25 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
         String orderNo = params.get("out_trade_no");
         LocalDateTime payTime = DateUtils.from(params.get("gmt_payment"), "yyyy-MM- dd HH:mm:ss");
         boolean isSuccess = "TRADE_SUCCESS".equals(params.get("trade_status"));
+        boolean isPaying = "WAIT_BUYER_PAY".equals(params.get("trade_status"));
         String message = params.get("trade_status");
-        notifyOrder(orderNo, isSuccess, payTime, message);
+        notifyOrder(orderNo, isSuccess, payTime, message, isPaying);
     }
 
-    private void notifyOrder(String orderNo, boolean isSuccess, LocalDateTime payTime, String message) throws Exception {
+    private void notifyOrder(String orderNo, boolean isSuccess, LocalDateTime payTime, String message, boolean isPaying) throws Exception {
         TaPay orderPay = getByOrderNo(orderNo);
         if (orderPay.getStatus() != Constants.PAY_READY) {
             return;
         }
         TaOrder taOrder = taOrderMapper.selectById(orderPay.getOrderId());
 
+        // 如果是支付中
+        if (isPaying) {
+            taOrder.setPayStatus(Constants.PAY_PROCESSING);
+            taOrderMapper.updateById(taOrder);
+            return;
+        }
+
         updateOrderPay(orderPay, taOrder, payTime, isSuccess, message);
     }
 

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

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.common.StringUtils;
 import com.yunzhi.nanyang.entity.SysUser;
 import com.yunzhi.nanyang.entity.TaPerson;
@@ -61,4 +62,9 @@ public class TaPersonServiceImpl extends BaseServiceImpl<TaPersonMapper, TaPerso
     public TaPerson getByPhone(String clientId, String phone) {
         return baseMapper.getByPhone(clientId, phone);
     }
+
+    @Override
+    public IPage<TaPerson> getPageBy(IPage<TaPerson> pg, String identity, String nickName, String phone) {
+        return baseMapper.getPageBy(pg, identity, nickName, phone);
+    }
 }

src/main/resources/mapper/SysUserMapper.xml

@@ -14,10 +14,11 @@
           AND s.`status` = 1
     </select>
     <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.SysUser">
-        SELECT
-            *
+        SELECT DISTINCT
+            t.*, s.nick_name
         FROM
             sys_user t
+            LEFT JOIN ta_person s ON s.user_id = t.user_id AND s.identity = 'worker'
         WHERE
             t.status &gt; -1
           AND t.user_id != #{adminId}

src/main/resources/mapper/TaDispatchMapper.xml

@@ -28,8 +28,7 @@
             INNER JOIN ta_person m ON t.person_id = m.person_id
             INNER JOIN ta_org n ON t.org_id = n.org_id
         WHERE
-            t.pay_status = 1
-            AND t.work_status < 3
+            t.work_status < 3
           <if test="orgId != null and orgId != ''">
             AND t.org_id = #{orgId}
           </if>

src/main/resources/mapper/TaOrderMapper.xml

@@ -32,7 +32,7 @@
             t.`status` > 0
         <if test="isWarn">
             AND TO_DAYS(t.appointment_date) = TO_DAYS(now())
-            AND t.pay_status = 1
+--             AND t.pay_status = 1
             AND t.dispatch_status = 1
             AND t.work_status = 0
         </if>

src/main/resources/mapper/TaPersonMapper.xml

@@ -2,4 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.TaPersonMapper">
 
+    <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TaPerson">
+        SELECT
+            *
+        FROM
+            ta_person t
+        WHERE
+            t.`status` &gt; -1
+          <if test="identity != null and identity != ''">
+            AND t.identity = #{identity}
+          </if>
+        <if test="nickName != null and nickName != ''">
+          AND t.nick_name LIKE CONCAT( '%', #{nickName}, '%' )
+        </if>
+        <if test="phone != null and phone != ''">
+          AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
+        </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>