feats

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

@@ -70,6 +70,19 @@ public class BaseController {
         return iSysUserDataScopeService.checkOrgAccess(orgId, userId);
     }
 
+    public SysUser checkWorker(TaPerson taPerson) throws Exception {
+        if (StringUtils.isEmpty(taPerson.getUserId())) {
+            throw new Exception("未绑定农机手");
+        }
+
+        SysUser sysUser = iSysUserService.getExistBy("user_id", taPerson.getUserId(), false, true);
+        if (null == sysUser) {
+            throw new Exception("农机手信息不存在");
+        }
+
+        return sysUser;
+    }
+
     public List<String> getAccessOrgs(String userId) {
         return iSysUserDataScopeService.getAccessOrgs(userId);
     }

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

@@ -1,7 +1,10 @@
 package com.yunzhi.nanyang.common;
 
 public class Constants {
+    // 超级管理员ID
     public final static String ADMIN_ID = "1";
+    // 平台账户ID
+    public final static String SYSTEM_ACC_ID = "system";
 
     public final static int STATUS_DELETE = -1;
     public final static int STATUS_READY = 0;
@@ -15,6 +18,20 @@ public class Constants {
     public final static String TARGET_MACHINERY = "machinery";  // 农机
     public final static String TARGET_NEWS = "news";    // 资讯
 
+    // 账户收支类型
+    public final static int ACCOUNT_INCOME = 1; // 收入
+    public final static int ACCOUNT_EXPEND = -1; // 支出
+
+    // 账户消费类型
+    public final static String ACCOUNT_ORDER_PAY = "order_pay"; // 订单支付
+    public final static String ACCOUNT_ORDER_REFUND = "order_refund"; // 订单退款
+    public final static String ACCOUNT_WITHDRAW = "withdraw"; // 提现
+
+    // 审批状态
+    public final static int AUDIT_READY = 0;    // 待审批
+    public final static int AUDIT_AGREE = 1;    // 审批通过
+    public final static int AUDIT_DISAGREE = 2;    // 审批不通过
+
     // 订单状态
     public final static int ORDER_CANCEL = 9;  // 待支付
 

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

@@ -48,7 +48,7 @@ public class JacksonConfig {
         // PrettyPrinter 格式化输出
         objectMapper.configure(SerializationFeature.INDENT_OUTPUT, true);
         // NULL不参与序列化
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+//        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
 
         // 指定时区
         objectMapper.setTimeZone(TimeZone.getTimeZone("GMT+8:00"));

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

@@ -4,7 +4,10 @@ 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.entity.SysUser;
+import com.yunzhi.nanyang.entity.TaPerson;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -40,24 +43,6 @@ public class TaAccountController extends BaseController {
     public ITaAccountService iTaAccountService;
 
 
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/taAccount",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taAccountList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TaAccount> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaAccount> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaAccount> result = iTaAccountService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
 
     /**
      * 保存对象
@@ -111,9 +96,16 @@ public class TaAccountController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taAccount/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taAccountGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaAccountService.getById(id));
+    @RequestMapping(value="/{client}/worker/account/mine",method= RequestMethod.GET)
+    @ApiOperation(value="我的钱包总额", notes = "我的钱包总额", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taAccountGet() throws Exception{
+        TaPerson taPerson = currentPerson();
+        SysUser sysUser = checkWorker(taPerson);
+        if (null == sysUser.getIsOrgManager() || !sysUser.getIsOrgManager()) {
+            return ResponseBean.error("");
+        }
+
+        TaAccount taAccount = iTaAccountService.getUserAccount(sysUser.getOrgId());
+        return ResponseBean.success(taAccount);
     }
 }

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

@@ -5,9 +5,15 @@ 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 com.yunzhi.nanyang.entity.SysUser;
+import com.yunzhi.nanyang.entity.TaAccount;
+import com.yunzhi.nanyang.entity.TaPerson;
+import com.yunzhi.nanyang.service.ITaAccountService;
+import com.yunzhi.nanyang.vo.AccountRecord;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +45,8 @@ public class TaAccountLogController extends BaseController {
     @Autowired
     public ITaAccountLogService iTaAccountLogService;
 
+    @Autowired
+    public ITaAccountService iTaAccountService;
 
     /**
      * 分页查询列表
@@ -46,74 +54,42 @@ public class TaAccountLogController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taAccountLog",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/account-log",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @RequiresPermissions("fi-system:view")
     public ResponseBean taAccountLogList(@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) throws Exception{
 
-		    IPage<TaAccountLog> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaAccountLog> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<AccountRecord> pg = new Page<>(pageNum, pageSize);
 
-            IPage<TaAccountLog> result = iTaAccountLogService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<AccountRecord> result = iTaAccountLogService.getPageBy(pg);
+        return ResponseBean.success(result);
     }
 
     /**
-     * 保存对象
-     * @param taAccountLog 实体对象
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taAccountLog",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taAccountLogAdd(@ApiParam("保存内容") @RequestBody TaAccountLog taAccountLog) throws Exception{
-
-        if (iTaAccountLogService.save(taAccountLog)){
-            return ResponseBean.success(taAccountLog);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taAccountLog/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taAccountLogDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaAccountLogService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+    @RequestMapping(value="/{client}/worker/account-log",method= RequestMethod.GET)
+    @ApiOperation(value="我的钱包明细", notes = "我的钱包明细", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taAccountList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+        TaPerson taPerson = currentPerson();
+        SysUser sysUser = checkWorker(taPerson);
+        if (null == sysUser.getIsOrgManager() || !sysUser.getIsOrgManager()) {
+            return ResponseBean.error("");
         }
-    }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taAccountLog 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taAccountLog/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taAccountLogUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaAccountLog taAccountLog) throws Exception{
+        TaAccount taAccount = iTaAccountService.getUserAccount(sysUser.getOrgId());
 
-        if (iTaAccountLogService.updateById(taAccountLog)){
-            return ResponseBean.success(iTaAccountLogService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
+        IPage<TaAccountLog> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaAccountLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("account_id", taAccount.getAccountId());
+        queryWrapper.orderByDesc("create_date");
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taAccountLog/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taAccountLogGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaAccountLogService.getById(id));
+        IPage<TaAccountLog> result = iTaAccountLogService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 }

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

@@ -0,0 +1,149 @@
+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.entity.TaPerson;
+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.ITaBankCardService;
+import com.yunzhi.nanyang.entity.TaBankCard;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 银行卡 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-04-08
+ */
+
+@Api(tags = "银行卡")
+@RestController
+@RequestMapping("/")
+public class TaBankCardController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaBankCardController.class);
+
+    @Autowired
+    public ITaBankCardService iTaBankCardService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/worker/bankcard",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taBankCardList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+        TaPerson taPerson = currentPerson();
+        checkWorker(taPerson);
+
+        IPage<TaBankCard> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaBankCard> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.eq("person_id", taPerson.getPersonId());
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaBankCard> result = iTaBankCardService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taBankCard 实体对象
+     * @return
+     */
+    @RequestMapping(value="/{client}/worker/bankcard",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taBankCardAdd(@ApiParam("保存内容") @RequestBody TaBankCard taBankCard) throws Exception{
+        TaPerson taPerson = currentPerson();
+        checkWorker(taPerson);
+
+        taBankCard.setPersonId(taPerson.getPersonId());
+        if (iTaBankCardService.save(taBankCard)){
+            return ResponseBean.success(taBankCard);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/{client}/worker/bankcard/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taBankCardDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TaBankCard bankCard = validate(id);
+
+        if(iTaBankCardService.removeLogicById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taBankCard 实体对象
+     * @return
+     */
+    @RequestMapping(value="/{client}/worker/bankcard/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taBankCardUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                        @ApiParam("更新内容") @RequestBody TaBankCard taBankCard) throws Exception{
+        TaBankCard bankCard = validate(id);
+        taBankCard.setCardId(id);
+        taBankCard.setPersonId(bankCard.getPersonId());
+
+        if (iTaBankCardService.updateById(taBankCard)){
+            return ResponseBean.success(iTaBankCardService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/{client}/worker/bankcard/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taBankCardGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(validate(id));
+    }
+
+    private TaBankCard validate(String cardId) throws Exception {
+        TaPerson taPerson = currentPerson();
+        checkWorker(taPerson);
+
+        TaBankCard bankCard = iTaBankCardService.getExistBy("card_id", cardId, false, true);
+        if (null == bankCard) {
+            throw new Exception("银行卡不存在");
+        }
+
+        if (!taPerson.getPersonId().equals(bankCard.getPersonId())) {
+            throw new Exception("无权操作");
+        }
+
+        return bankCard;
+    }
+}

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

@@ -79,7 +79,8 @@ public class TaDispatchController extends BaseController {
                                        @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,
-                                       @ApiParam("状态") @RequestParam(value ="status", required = false) String status) throws Exception{
+                                       @ApiParam("状态") @RequestParam(value ="status", required = false) String status,
+                                       @ApiParam("状态") @RequestParam(value ="isWarn", defaultValue = "false") Boolean isWarn) throws Exception{
 
         SysUser user = currentUser();
         if (!Constants.ADMIN_ID.equals(user.getUserId()) && !StringUtils.isEmpty(orgId)) {
@@ -93,7 +94,7 @@ public class TaDispatchController extends BaseController {
         LocalDateTime start = DateUtils.getDayStart(startDate);
         LocalDateTime end = DateUtils.getDayEnd(endDate);
 
-        IPage<TaOrder> result = iTaDispatchService.getPageBy(pg, orgId, typeId, machineryId, start, end, phone, status);
+        IPage<TaOrder> result = iTaDispatchService.getPageBy(pg, orgId, typeId, machineryId, start, end, phone, status, isWarn);
         return ResponseBean.success(result);
     }
 

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

@@ -56,6 +56,9 @@ public class TaOrderController extends BaseController {
     @Autowired
     public ITaPayService iTaPayService;
 
+    @Autowired
+    public ITaDispatchService iTaDispatchService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -66,7 +69,9 @@ public class TaOrderController extends BaseController {
     @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,
+                                @ApiParam("是否预警") @RequestParam(value ="isWarn", defaultValue = "false") Boolean isWarn,
                                 @ApiParam("机构") @RequestParam(value ="orgId", required = false) String orgId,
+                                @ApiParam("订单号") @RequestParam(value ="orderNo", required = false) String orderNo,
                                 @ApiParam("农机") @RequestParam(value ="machineryId", required = false) String machineryId,
                                 @ApiParam("类型") @RequestParam(value ="typeId", required = false) String typeId,
                                 @ApiParam("下单人") @RequestParam(value ="personName", required = false) String personName,
@@ -85,7 +90,20 @@ public class TaOrderController extends BaseController {
         }
 
         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);
+        IPage<TaOrder> result = iTaOrderService.getAdminPage(pg,
+                isAdmin ? null : current.getUserId(),
+                orgId,
+                orderNo,
+                machineryId,
+                typeId,
+                personName,
+                phone,
+                payStatus,
+                dispatchStatus,
+                workStatus,
+                isEvaluated,
+                isWarn);
+
         return ResponseBean.success(result);
     }
 
@@ -226,6 +244,12 @@ public class TaOrderController extends BaseController {
             throw new Exception("订单机构不存在");
         }
 
+        TaDispatch taDispatch = iTaDispatchService.getExistBy("order_id", taOrder.getOrderId(), false, true);
+        if (taDispatch != null) {
+            taOrder.setWorkId(taDispatch.getWorkerId());
+            taOrder.setWorkName(taDispatch.getWorkerName());
+        }
+
         taOrder.setOrgName(taOrg.getName());
 
         TaPerson taPerson = iTaPersonService.getById(taOrder.getPersonId());

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

@@ -3,8 +3,11 @@ 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 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -17,9 +20,10 @@ 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 com.yunzhi.nanyang.entity.TaWithdrawal;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
     * 提现表 前端控制器
@@ -39,6 +43,15 @@ public class TaWithdrawalController extends BaseController {
     @Autowired
     public ITaWithdrawalService iTaWithdrawalService;
 
+    @Autowired
+    public ISysUserService iSysUserService;
+
+    @Autowired
+    public ITaBankCardService iTaBankCardService;
+
+    @Autowired
+    public ITaAccountService iTaAccountService;
+
 
     /**
      * 分页查询列表
@@ -46,17 +59,32 @@ public class TaWithdrawalController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taWithdrawal",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/withdrawal",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taWithdrawalList(@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("机构ID") @RequestParam(value ="orgId", required = false) String orgId,
+                                         @ApiParam(value = "开始日期", example = "2022-03-01") @RequestParam(value ="start",required = false) String start,
+                                         @ApiParam(value = "结束日期", example = "2022-03-31") @RequestParam(value ="end",required = false) String end) throws Exception{
+
+        SysUser sysUser = currentUser();
+        boolean isAdmin = Constants.ADMIN_ID.equals(sysUser.getUserId());
+        if (!isAdmin) {
+            if (StringUtils.isEmpty(orgId)) {
+                orgId = sysUser.getOrgId();
+            } else {
+                if (!checkOrgAccess(orgId, sysUser.getUserId())) {
+                    return ResponseBean.error("暂无机构数据查询权限");
+                }
+            }
+        }
 
-		    IPage<TaWithdrawal> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaWithdrawal> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        LocalDateTime startDate = DateUtils.getDayStart(start);
+        LocalDateTime endDate = DateUtils.getDayEnd(end);
 
-            IPage<TaWithdrawal> result = iTaWithdrawalService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaWithdrawal> pg = new Page<>(pageNum, pageSize);
+        IPage<TaWithdrawal> result = iTaWithdrawalService.getPageBy(pg, orgId, startDate, endDate);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,9 +92,34 @@ public class TaWithdrawalController extends BaseController {
      * @param taWithdrawal 实体对象
      * @return
      */
-    @RequestMapping(value="/taWithdrawal",method= RequestMethod.POST)
+    @RequestMapping(value="/{client}/worker/withdrawal",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taWithdrawalAdd(@ApiParam("保存内容") @RequestBody TaWithdrawal taWithdrawal) throws Exception{
+        TaPerson taPerson = currentPerson();
+        SysUser sysUser = checkWorker(taPerson);
+        if (null == sysUser) {
+            return ResponseBean.error("农机手信息异常");
+        }
+
+        if (null == sysUser.getIsOrgManager() || !sysUser.getIsOrgManager()) {
+            return ResponseBean.error("暂无权限进行当前操作");
+        }
+
+        if (!StringUtils.isEmpty(taWithdrawal.getAccountCardNo())) {
+            TaBankCard bankCard = iTaBankCardService.getById(taWithdrawal.getAccountCardNo());
+            if (null == bankCard || !taPerson.getPersonId().equals(bankCard.getPersonId())) {
+                return ResponseBean.error("银行卡校验异常");
+            }
+        }
+
+        if (!iTaAccountService.checkAmount(sysUser.getOrgId(), taWithdrawal.getMoney(), true)) {
+            return ResponseBean.error("账户余额不足");
+        }
+
+        taWithdrawal.setAuditStatus(Constants.AUDIT_READY);
+        taWithdrawal.setUserId(sysUser.getUserId());
+        taWithdrawal.setUserName(sysUser.getUserName());
+        taWithdrawal.setOrgId(sysUser.getOrgId());
 
         if (iTaWithdrawalService.save(taWithdrawal)){
             return ResponseBean.success(taWithdrawal);
@@ -79,10 +132,30 @@ public class TaWithdrawalController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taWithdrawal/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/{client}/worker/withdrawal/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taWithdrawalDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaWithdrawalService.removeById(id)){
+    public ResponseBean taWithdrawalDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TaPerson taPerson = currentPerson();
+        SysUser sysUser = checkWorker(taPerson);
+        if (null == sysUser) {
+            return ResponseBean.error("农机手信息异常");
+        }
+
+        if (null == sysUser.getIsOrgManager() || !sysUser.getIsOrgManager()) {
+            return ResponseBean.error("暂无权限进行当前操作");
+        }
+
+        TaWithdrawal taWithdrawal = iTaWithdrawalService.getExistBy("withdrawal_id", id, false, true);
+        if (null == taWithdrawal || !sysUser.getUserId().equals(taWithdrawal.getUserId())) {
+            return ResponseBean.error("暂无权限进行当前操作");
+        }
+
+        Integer auditStatus = taWithdrawal.getAuditStatus();
+        if (null != auditStatus && auditStatus != Constants.AUDIT_READY) {
+            return ResponseBean.error("申请已进入审批流程");
+        }
+
+        if(iTaWithdrawalService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -95,12 +168,100 @@ public class TaWithdrawalController extends BaseController {
      * @param taWithdrawal 实体对象
      * @return
      */
-    @RequestMapping(value="/taWithdrawal/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/{client}/worker/withdrawal/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taWithdrawalUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean taWithdrawalUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaWithdrawal taWithdrawal) throws Exception{
+        TaPerson taPerson = currentPerson();
+        SysUser sysUser = checkWorker(taPerson);
+        if (null == sysUser) {
+            return ResponseBean.error("农机手信息异常");
+        }
+
+        if (null == sysUser.getIsOrgManager() || !sysUser.getIsOrgManager()) {
+            return ResponseBean.error("暂无权限进行当前操作");
+        }
+
+        TaWithdrawal origin = iTaWithdrawalService.getExistBy("withdrawal_id", id, false, true);
+        if (null == origin || !sysUser.getUserId().equals(origin.getUserId())) {
+            return ResponseBean.error("暂无权限进行当前操作");
+        }
+
+        Integer auditStatus = origin.getAuditStatus();
+        if (null != auditStatus && auditStatus != Constants.AUDIT_READY) {
+            return ResponseBean.error("申请已进入审批流程");
+        }
+
+        // 只允许修改 金额与卡号
+        if (!StringUtils.isEmpty(taWithdrawal.getAccountCardNo())) {
+            TaBankCard bankCard = iTaBankCardService.getById(taWithdrawal.getAccountCardNo());
+            if (null == bankCard || !taPerson.getPersonId().equals(bankCard.getPersonId())) {
+                return ResponseBean.error("银行卡校验异常");
+            }
+        }
+
+        if (!iTaAccountService.checkAmount(origin.getOrgId(), taWithdrawal.getMoney(), true)) {
+            return ResponseBean.error("账户余额不足");
+        }
+
+        origin.setMoney(taWithdrawal.getMoney());
+        origin.setAccountCardNo(taWithdrawal.getAccountCardNo());
+        origin.setAccountCardType(taWithdrawal.getAccountCardType());
+
+        if (iTaWithdrawalService.updateById(origin)){
+            return ResponseBean.success(iTaWithdrawalService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taWithdrawal 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/withdrawal/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="审批", notes = "审批", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taWithdrawalAudit(@ApiParam("对象ID") @PathVariable String id,
+                                          @ApiParam("更新内容") @RequestBody TaWithdrawal taWithdrawal) throws Exception{
+        SysUser sysUser = currentUser();
+
+        TaWithdrawal origin = iTaWithdrawalService.getExistBy("withdrawal_id", id, false, true);
+        if (null == origin) {
+            return ResponseBean.error("申请不存在");
+        }
+
+        String orgId = origin.getOrgId();
+        boolean isAdmin = Constants.ADMIN_ID.equals(sysUser.getUserId());
+        if (!isAdmin) {
+            if (!checkOrgAccess(orgId, sysUser.getUserId())) {
+                return ResponseBean.error("暂无操作权限");
+            }
+        }
+
+        // 不能重复审批, 因为审批有账户操作
+        Integer auditStatus = origin.getAuditStatus();
+        if (null != auditStatus && auditStatus > Constants.AUDIT_READY) {
+            return ResponseBean.error("审批流程已走完");
+        }
+
+        if (!iTaAccountService.checkAmount(orgId, taWithdrawal.getMoney(), false) && Constants.AUDIT_AGREE == taWithdrawal.getAuditStatus()) {
+            return ResponseBean.error("账户余额不足");
+        }
+
+        // 只允许修改审批相关信息
+        origin.setAuditUser(sysUser.getUserId());
+        origin.setAuditUserName(sysUser.getUserName());
+        origin.setAuditStatus(taWithdrawal.getAuditStatus());
+        origin.setAuditRemark(taWithdrawal.getAuditRemark());
+
+        if (iTaWithdrawalService.updateById(origin)){
+
+            // 处理账户信息
+            iTaAccountService.withdraw(origin);
 
-        if (iTaWithdrawalService.updateById(taWithdrawal)){
             return ResponseBean.success(iTaWithdrawalService.getById(id));
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -111,9 +272,29 @@ public class TaWithdrawalController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taWithdrawal/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/withdrawal/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taWithdrawalGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaWithdrawalService.getById(id));
+    public ResponseBean taWithdrawalGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TaWithdrawal taWithdrawal = iTaWithdrawalService.getExistBy("withdrawal_id", id, false, true);
+        if (null == taWithdrawal) {
+            return ResponseBean.error("提现申请不存在");
+        }
+
+        SysUser sysUser = currentUser();
+        String orgId = taWithdrawal.getOrgId();
+        boolean isAdmin = Constants.ADMIN_ID.equals(sysUser.getUserId());
+        if (!isAdmin) {
+            if (!checkOrgAccess(orgId, sysUser.getUserId())) {
+                return ResponseBean.error("暂无数据查询权限");
+            }
+        }
+
+        TaBankCard taBankCard = iTaBankCardService.getById(taWithdrawal.getAccountCardNo());
+        taWithdrawal.setBankCard(taBankCard);
+
+        TaAccount taAccount = iTaAccountService.getUserAccount(taWithdrawal.getOrgId());
+        taWithdrawal.setAmountLeft(taAccount.getAmounts());
+
+        return ResponseBean.success(taWithdrawal);
     }
 }

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

@@ -3,10 +3,7 @@ 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.yunzhi.nanyang.common.*;
 import com.yunzhi.nanyang.entity.*;
 import com.yunzhi.nanyang.service.*;
 import io.swagger.annotations.Api;
@@ -55,6 +52,42 @@ public class TaWorkJobController extends BaseController {
     @Autowired
     public ITaMachineryService iTaMachineryService;
 
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/work-job",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,
+                                @ApiParam(value = "合作社ID") @RequestParam(value ="orgId", required = false) String orgId,
+                                @ApiParam(value = "起始时间", example = "2022-03-01") @RequestParam(value ="start", required = false) String start,
+                                @ApiParam(value = "结束时间", example = "2022-03-31") @RequestParam(value ="end", required = false) String end,
+                                @ApiParam(value = "订单号") @RequestParam(value ="orderNo", required = false) String orderNo,
+                                @ApiParam(value = "农机型号ID") @RequestParam(value ="machineryTypeId", required = false) String machineryTypeId,
+                                @ApiParam(value = "农机ID") @RequestParam(value ="machineryId", required = false) String machineryId,
+                                @ApiParam(value = "农机手名称") @RequestParam(value ="workerName", required = false) String workerName) throws Exception{
+        SysUser sysUser = currentUser();
+        if (!Constants.ADMIN_ID.equals(sysUser.getUserId()) && !StringUtils.isEmpty(orgId)) {
+            if (checkOrgAccess(orgId, sysUser.getUserId())) {
+                return ResponseBean.error("暂无合作设数据权限");
+            }
+        }
+
+        LocalDateTime startDate = DateUtils.getDayStart(start);
+        LocalDateTime endDate = DateUtils.getDayEnd(end);
+
+        Integer status = Constants.WORK_DONE;
+
+        IPage<TaWorkJob> pg = new Page<>(pageNum, pageSize);
+        IPage<TaWorkJob> result = iTaWorkJobService.getAdminPageBy(pg, orgId, startDate, endDate, status, orderNo, machineryTypeId, machineryId, workerName);
+        return ResponseBean.success(result);
+    }
+
+
     /**
      * 分页查询列表
      * @param pageNum

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

@@ -0,0 +1,121 @@
+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 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.ITdBankService;
+import com.yunzhi.nanyang.entity.TdBank;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 银行 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-04-10
+ */
+
+@Api(tags = "银行")
+@RestController
+@RequestMapping("/")
+public class TdBankController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdBankController.class);
+
+    @Autowired
+    public ITdBankService iTdBankService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/{clientId}/bank",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean tdBankList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+
+        IPage<TdBank> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TdBank> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+        queryWrapper.orderByAsc("sort_no");
+
+        IPage<TdBank> result = iTdBankService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+//    /**
+//     * 保存对象
+//     * @param tdBank 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/tdBank",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean tdBankAdd(@ApiParam("保存内容") @RequestBody TdBank tdBank) throws Exception{
+//
+//        if (iTdBankService.save(tdBank)){
+//            return ResponseBean.success(tdBank);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/tdBank/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean tdBankDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTdBankService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param tdBank 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/tdBank/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean tdBankUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TdBank tdBank) throws Exception{
+//
+//        if (iTdBankService.updateById(tdBank)){
+//            return ResponseBean.success(iTdBankService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/tdBank/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean tdBankGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTdBankService.getById(id));
+//    }
+}

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

@@ -1,6 +1,7 @@
 package com.yunzhi.nanyang.controller;
 
 import com.github.binarywang.wxpay.bean.notify.*;
+import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.yunzhi.nanyang.common.BaseController;
 import com.yunzhi.nanyang.common.WxUtils;
@@ -25,24 +26,35 @@ public class WxPayController extends BaseController {
 
     @ResponseBody
     @RequestMapping("/notify/order")
-    public String payNotify(@RequestBody String jsonData) throws Exception {
+    public String payNotify(@RequestBody String jsonData) {
         WxPayService payService = wxUtils.getPayService();
-        WxPayOrderNotifyV3Result result = payService.parseOrderNotifyV3Result(jsonData, null);
+        WxPayOrderNotifyV3Result result = null;
+        try {
+            result = payService.parseOrderNotifyV3Result(jsonData, null);
+            orderPayService.notifyOrder(result.getResult());
+            return WxPayNotifyResponse.success("OK");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return WxPayNotifyResponse.fail(e.getMessage());
+        }
 
-        orderPayService.notifyOrder(result.getResult());
 
-        return WxPayNotifyResponse.success("OK");
     }
 
     @ResponseBody
     @RequestMapping("/notify/refund")
-    public String refundNotify(@RequestBody String jsonData) throws Exception {
+    public String refundNotify(@RequestBody String jsonData) {
         WxPayService payService = wxUtils.getPayService();
-        WxPayRefundNotifyV3Result result = payService.parseRefundNotifyV3Result(jsonData, null);
+        WxPayRefundNotifyV3Result result = null;
+        try {
+            result = payService.parseRefundNotifyV3Result(jsonData, null);
+            orderPayService.refundNotifyOrder(result.getResult());
+            return WxPayNotifyResponse.success("OK");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return WxPayNotifyResponse.fail(e.getMessage());
+        }
 
-        orderPayService.refundNotifyOrder(result.getResult());
-
-        return WxPayNotifyResponse.success("OK");
     }
 
 }

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

@@ -50,6 +50,9 @@ public class SysUser implements Serializable {
     @ApiModelProperty(value = "机构ID")
     private String orgId;
 
+    @ApiModelProperty(value = "是否机构管理员")
+    private Boolean isOrgManager;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 

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

@@ -27,7 +27,7 @@ public class TaAccount implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "账户id")
-    @TableId(value = "account_id", type = IdType.INPUT)
+    @TableId(value = "account_id", type = IdType.UUID)
     private String accountId;
 
     @ApiModelProperty(value = "人员ID;1银行卡号2微信账户3支付宝账户")

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

@@ -30,6 +30,9 @@ public class TaAccountLog implements Serializable {
     @TableId(value = "log_id", type = IdType.AUTO)
     private Integer logId;
 
+    @ApiModelProperty(value = "支付Id")
+    private String payId;
+
     @ApiModelProperty(value = "账户Id")
     private String accountId;
 

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

@@ -0,0 +1,55 @@
+package com.yunzhi.nanyang.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+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-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaBankCard对象", description="银行卡")
+public class TaBankCard implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "卡ID")
+    @TableId(value = "card_id", type = IdType.UUID)
+    private String cardId;
+
+    @ApiModelProperty(value = "卡号")
+    private String cardNo;
+
+    @ApiModelProperty(value = "人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "持卡人名称")
+    private String owerName;
+
+    @ApiModelProperty(value = "预留手机")
+    private String phone;
+
+    @ApiModelProperty(value = "开户行")
+    private String ownerBank;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+
+}

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

@@ -2,6 +2,8 @@ package com.yunzhi.nanyang.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -57,5 +59,8 @@ public class TaPerson implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "是否机构管理员")
+    private Boolean isOrgManager;
 
 }

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

@@ -2,6 +2,8 @@ package com.yunzhi.nanyang.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -27,7 +29,7 @@ public class TaWithdrawal implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "提现Id")
-    @TableId(value = "withdrawal_id", type = IdType.INPUT)
+    @TableId(value = "withdrawal_id", type = IdType.UUID)
     private String withdrawalId;
 
     @ApiModelProperty(value = "申请人")
@@ -69,8 +71,17 @@ public class TaWithdrawal implements Serializable {
     @ApiModelProperty(value = "机构ID")
     private String orgId;
 
+    @ApiModelProperty(value = "机构名称")
+    private String orgName;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "银行卡")
+    private TaBankCard bankCard;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "账户余额")
+    private Integer amountLeft;
 }

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

@@ -73,6 +73,10 @@ public class TaWorkJob implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "下单人Id")
     private String personId;
@@ -101,7 +105,23 @@ public class TaWorkJob implements Serializable {
     @ApiModelProperty(value = "下单时间")
     private LocalDateTime orderDate;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "农机手名称")
+    private String workerName;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "农机名称")
     private String machineryName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "机构名称")
+    private String orgName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "农机型号Id")
+    private String machineryTypeId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "农机型号名称")
+    private String machineryTypeName;
 }

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

@@ -0,0 +1,54 @@
+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-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TdBank对象", description="银行")
+public class TdBank implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "银行ID")
+    @TableId(value = "bank_id", type = IdType.INPUT)
+    private String bankId;
+
+    @ApiModelProperty(value = "银行编码")
+    private String bankCode;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "logo")
+    private String logo;
+
+    @ApiModelProperty(value = "颜色1")
+    private String color1;
+
+    @ApiModelProperty(value = "颜色2")
+    private String color2;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sortNo;
+
+
+}

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

@@ -1,7 +1,9 @@
 package com.yunzhi.nanyang.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaAccountLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.nanyang.vo.AccountRecord;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaAccountLogMapper extends BaseMapper<TaAccountLog> {
 
+    IPage<AccountRecord> getPageBy(IPage<AccountRecord> pg);
 }

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

@@ -3,6 +3,7 @@ package com.yunzhi.nanyang.mapper;
 import com.yunzhi.nanyang.entity.TaAccount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaAccountMapper extends BaseMapper<TaAccount> {
 
+    int updateColumn(@Param("accountId") String accountId,@Param("columnName") String columnName,@Param("value") int value);
 }

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

@@ -0,0 +1,18 @@
+package com.yunzhi.nanyang.mapper;
+
+import com.yunzhi.nanyang.entity.TaBankCard;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 银行卡 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-04-08
+ */
+@Mapper
+public interface TaBankCardMapper extends BaseMapper<TaBankCard> {
+
+}

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

@@ -27,5 +27,6 @@ public interface TaDispatchMapper extends BaseMapper<TaDispatch> {
                              @Param("start") LocalDateTime start,
                              @Param("end") LocalDateTime end,
                              @Param("phone") String phone,
-                             @Param("status") String status);
+                             @Param("status") String status,
+                             @Param("isWarn") Boolean isWarn);
 }

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

@@ -26,6 +26,7 @@ public interface TaOrderMapper extends BaseMapper<TaOrder> {
     IPage<TaOrder> getAdminPage(IPage<TaOrder> pg,
                                 @Param("userId") String userId,
                                 @Param("orgId") String orgId,
+                                @Param("orderNo") String orderNo,
                                 @Param("machineryId") String machineryId,
                                 @Param("typeId") String typeId,
                                 @Param("personName") String personName,
@@ -33,7 +34,8 @@ public interface TaOrderMapper extends BaseMapper<TaOrder> {
                                 @Param("payStatus") Integer payStatus,
                                 @Param("dispatchStatus") Integer dispatchStatus,
                                 @Param("workStatus") Integer workStatus,
-                                @Param("isEvaluated") Integer isEvaluated);
+                                @Param("isEvaluated") Integer isEvaluated,
+                                @Param("isWarn") Boolean isWarn);
 
     IPage<TaOrder> getClientPage(IPage<TaOrder> pg,
                                  @Param("personId") String personId,

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

@@ -1,8 +1,12 @@
 package com.yunzhi.nanyang.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaWithdrawal;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -15,4 +19,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaWithdrawalMapper extends BaseMapper<TaWithdrawal> {
 
+    IPage<TaWithdrawal> getPageBy(IPage<TaWithdrawal> pg,
+                                  @Param("orgId") String orgId,
+                                  @Param("startDate") LocalDateTime startDate,
+                                  @Param("endDate") LocalDateTime endDate);
+
+    Integer getTotalMoney(@Param("orgId") String orgId,@Param("auditStatus") Integer auditStatus);
 }

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 作业表 Mapper 接口
@@ -20,4 +22,14 @@ public interface TaWorkJobMapper extends BaseMapper<TaWorkJob> {
     IPage<TaWorkJob> getPageBy(IPage<TaWorkJob> pg, @Param("userId") String userId);
 
     TaWorkJob getDetailBy(@Param("id") String id);
+
+    IPage<TaWorkJob> getAdminPageBy(IPage<TaWorkJob> pg,
+                                    @Param("orgId") String orgId,
+                                    @Param("startDate") LocalDateTime startDate,
+                                    @Param("endDate") LocalDateTime endDate,
+                                    @Param("status") Integer status,
+                                    @Param("orderNo") String orderNo,
+                                    @Param("machineryTypeId") String machineryTypeId,
+                                    @Param("machineryId") String machineryId,
+                                    @Param("workerName") String workerName);
 }

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

@@ -0,0 +1,18 @@
+package com.yunzhi.nanyang.mapper;
+
+import com.yunzhi.nanyang.entity.TdBank;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 银行 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-04-10
+ */
+@Mapper
+public interface TdBankMapper extends BaseMapper<TdBank> {
+
+}

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

@@ -1,7 +1,9 @@
 package com.yunzhi.nanyang.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaAccountLog;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.nanyang.vo.AccountRecord;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaAccountLogService extends IBaseService<TaAccountLog> {
 
+    IPage<AccountRecord> getPageBy(IPage<AccountRecord> pg);
 }

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

@@ -1,7 +1,7 @@
 package com.yunzhi.nanyang.service;
 
 import com.yunzhi.nanyang.entity.TaAccount;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.nanyang.entity.TaWithdrawal;
 
 /**
  * <p>
@@ -12,5 +12,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-03-08
  */
 public interface ITaAccountService extends IBaseService<TaAccount> {
+    TaAccount getUserAccount(String userId) throws Exception;
 
+    boolean checkAmount(String orgId, Integer money, Boolean isIncluded) throws Exception;
+
+    boolean withdraw(TaWithdrawal taWithdrawal) throws Exception;
 }

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

@@ -0,0 +1,16 @@
+package com.yunzhi.nanyang.service;
+
+import com.yunzhi.nanyang.entity.TaBankCard;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 银行卡 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-04-08
+ */
+public interface ITaBankCardService extends IBaseService<TaBankCard> {
+
+}

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

@@ -2,7 +2,6 @@ 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;
@@ -17,5 +16,5 @@ import java.time.LocalDateTime;
  */
 public interface ITaDispatchService extends IBaseService<TaDispatch> {
 
-    IPage<TaOrder> getPageBy(IPage<TaOrder> pg, String orgId, String typeId, 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, Boolean isWarn);
 }

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

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

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

@@ -14,9 +14,9 @@ public interface ITaPayService extends IBaseService<TaPay> {
 
     TaPay getByOrderNo(String orderNo);
 
-    void notifyOrder(WxPayOrderNotifyV3Result.DecryptNotifyResult result);
+    void notifyOrder(WxPayOrderNotifyV3Result.DecryptNotifyResult result) throws Exception;
 
     void refund(String client, String clientId, TaOrder taOrder) throws Exception;
 
-    void refundNotifyOrder(WxPayRefundNotifyV3Result.DecryptNotifyResult result);
+    void refundNotifyOrder(WxPayRefundNotifyV3Result.DecryptNotifyResult result) throws Exception;
 }

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

@@ -1,8 +1,11 @@
 package com.yunzhi.nanyang.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaWithdrawal;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 提现表 服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaWithdrawalService extends IBaseService<TaWithdrawal> {
 
+    IPage<TaWithdrawal> getPageBy(IPage<TaWithdrawal> pg, String orgId, LocalDateTime startDate, LocalDateTime endDate);
 }

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

@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaDispatch;
 import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.entity.TaWorkJob;
-import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -21,4 +22,6 @@ public interface ITaWorkJobService extends IBaseService<TaWorkJob> {
     IPage<TaWorkJob> getPageBy(IPage<TaWorkJob> pg, String userId);
 
     TaWorkJob getDetailBy(String id);
+
+    IPage<TaWorkJob> getAdminPageBy(IPage<TaWorkJob> pg, String orgId, LocalDateTime startDate, LocalDateTime endDate, Integer status, String orderNo, String machineryTypeId, String machineryId, String workerName);
 }

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

@@ -0,0 +1,16 @@
+package com.yunzhi.nanyang.service;
+
+import com.yunzhi.nanyang.entity.TdBank;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 银行 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-04-10
+ */
+public interface ITdBankService extends IService<TdBank> {
+
+}

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

@@ -1,9 +1,11 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaAccountLog;
 import com.yunzhi.nanyang.mapper.TaAccountLogMapper;
 import com.yunzhi.nanyang.service.ITaAccountLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.nanyang.vo.AccountRecord;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +19,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaAccountLogServiceImpl extends BaseServiceImpl<TaAccountLogMapper, TaAccountLog> implements ITaAccountLogService {
 
+    @Override
+    public IPage<AccountRecord> getPageBy(IPage<AccountRecord> pg) {
+        return baseMapper.getPageBy(pg);
+    }
 }

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

@@ -1,10 +1,19 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.yunzhi.nanyang.common.Constants;
+import com.yunzhi.nanyang.common.StringUtils;
 import com.yunzhi.nanyang.entity.TaAccount;
+import com.yunzhi.nanyang.entity.TaAccountLog;
+import com.yunzhi.nanyang.entity.TaWithdrawal;
+import com.yunzhi.nanyang.mapper.TaAccountLogMapper;
 import com.yunzhi.nanyang.mapper.TaAccountMapper;
+import com.yunzhi.nanyang.mapper.TaWithdrawalMapper;
 import com.yunzhi.nanyang.service.ITaAccountService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,4 +26,79 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaAccountServiceImpl extends BaseServiceImpl<TaAccountMapper, TaAccount> implements ITaAccountService {
 
+    @Autowired
+    TaWithdrawalMapper taWithdrawalMapper;
+
+    @Autowired
+    TaAccountLogMapper taAccountLogMapper;
+
+    @Override
+    public TaAccount getUserAccount(String userId) throws Exception {
+        if (StringUtils.isEmpty(userId)) return null;
+
+        TaAccount taAccount = getExistBy("user_id", userId, false, false);
+        if (null == taAccount) {
+            taAccount = new TaAccount();
+            taAccount.setUserId(userId);
+            save(taAccount);
+        }
+
+        return taAccount;
+    }
+
+    @Override
+    public boolean checkAmount(String orgId, Integer money, Boolean isIncluded) throws Exception {
+        TaAccount taAccount = getUserAccount(orgId);
+        if (null == money || money <= 0) {
+            throw new Exception("校验提款金额失败");
+        }
+
+        // 计算所有未审批金额
+        Integer totalMoney = taWithdrawalMapper.getTotalMoney(orgId, Constants.AUDIT_READY);
+        if (null == totalMoney) {
+            totalMoney = 0;
+        }
+
+        int amount = money;
+        if (null != isIncluded && isIncluded) {
+            amount += totalMoney;
+        }
+
+        return taAccount.getAmounts() > amount;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean withdraw(TaWithdrawal taWithdrawal) throws Exception {
+        TaAccount taAccount = getUserAccount(taWithdrawal.getOrgId());
+
+        if (taAccount.getAmounts() < taWithdrawal.getMoney()) {
+            throw new Exception("账户余额不足");
+        }
+
+        TaAccountLog taAccountLog = new TaAccountLog();
+        taAccountLog.setAccountId(taAccount.getAccountId());
+        taAccountLog.setFeeType(Constants.ACCOUNT_EXPEND);
+        taAccountLog.setChargeType(Constants.ACCOUNT_WITHDRAW);
+        taAccountLog.setMoney(taWithdrawal.getMoney());
+        taAccountLog.setOrderId(taWithdrawal.getWithdrawalId());
+        taAccountLog.setCreateDate(LocalDateTime.now());
+
+        if (taAccountLogMapper.insert(taAccountLog) < 1) {
+            return false;
+        }
+
+        // 余额减少
+        int row = baseMapper.updateColumn(taAccount.getAccountId(), "amounts", taAccountLog.getFeeType() * Math.abs(taAccountLog.getMoney()) );
+        if (row < 1) {
+            throw new Exception("更新账户余额异常");
+        }
+        // 支出增加
+        row = baseMapper.updateColumn(taAccount.getAccountId(), "paid_fee", Math.abs(taAccountLog.getMoney()) );
+        if (row < 1) {
+            throw new Exception("更新账户支出异常");
+        }
+
+        return true;
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.yunzhi.nanyang.service.impl;
+
+import com.yunzhi.nanyang.entity.TaBankCard;
+import com.yunzhi.nanyang.mapper.TaBankCardMapper;
+import com.yunzhi.nanyang.service.ITaBankCardService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 银行卡 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-04-08
+ */
+@Service
+public class TaBankCardServiceImpl extends BaseServiceImpl<TaBankCardMapper, TaBankCard> implements ITaBankCardService {
+
+}

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

@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
 public class TaDispatchServiceImpl extends BaseServiceImpl<TaDispatchMapper, TaDispatch> implements ITaDispatchService {
 
     @Override
-    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);
+    public IPage<TaOrder> getPageBy(IPage<TaOrder> pg, String orgId, String typeId, String machineryId, LocalDateTime start, LocalDateTime end, String phone, String status, Boolean isWarn) {
+        return baseMapper.getPageBy(pg, orgId, typeId, machineryId, start, end, phone, status, isWarn);
     }
 }

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

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

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

@@ -13,11 +13,12 @@ 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.TaAccount;
+import com.yunzhi.nanyang.entity.TaAccountLog;
 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.mapper.*;
+import com.yunzhi.nanyang.service.ITaAccountService;
 import com.yunzhi.nanyang.service.ITaPayService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +31,8 @@ import java.time.format.DateTimeFormatter;
 @Service
 public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implements ITaPayService {
 
+    @Autowired
+    ITaAccountService iTaAccountService;
 
     @Autowired
     TaPersonMapper taPersonMapper;
@@ -40,6 +43,12 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
     @Autowired
     WxPayUtils wxPayUtils;
 
+    @Autowired
+    TaAccountLogMapper taAccountLogMapper;
+
+    @Autowired
+    TaAccountMapper taAccountMapper;
+
     @Override
     public WxPayUnifiedOrderV3Result.JsapiResult createPay(String client, String clientId, TaOrder taOrder) throws Exception {
         TaPay taPay = getByOrderNo(taOrder.getOrderNo());
@@ -86,6 +95,8 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
                     updateById(taPay);
                 }
                 taOrderMapper.updatePayStatus(taPay.getOrderId(), Constants.PAY_PAID);
+                // 插入账户流水
+                insertAccount(taPay, taOrder.getOrgId(), Constants.ACCOUNT_INCOME, Constants.ACCOUNT_ORDER_PAY);
             }
 
             throw e;
@@ -124,7 +135,7 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
     }
 
     @Override
-    public void notifyOrder(WxPayOrderNotifyV3Result.DecryptNotifyResult result) {
+    public void notifyOrder(WxPayOrderNotifyV3Result.DecryptNotifyResult result) throws Exception {
         TaPay orderPay = getByOrderNo(result.getOutTradeNo());
         if (orderPay.getStatus() != Constants.PAY_READY) {
             return;
@@ -139,11 +150,12 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
 
         // 更新订单状态
         if (isSuccess) {
+            TaOrder taOrder = taOrderMapper.selectById(orderPay.getOrderId());
             taOrderMapper.updatePayStatus(orderPay.getOrderId(), Constants.PAY_PAID);
-        }
 
-        // 插入账户流水
-        // 暂无
+            // 插入账户流水
+            insertAccount(orderPay, taOrder.getOrgId(), Constants.ACCOUNT_INCOME, Constants.ACCOUNT_ORDER_PAY);
+        }
     }
 
     @Override
@@ -194,7 +206,7 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
     }
 
     @Override
-    public void refundNotifyOrder(WxPayRefundNotifyV3Result.DecryptNotifyResult result) {
+    public void refundNotifyOrder(WxPayRefundNotifyV3Result.DecryptNotifyResult result) throws Exception {
         TaPay taPay = getByOrderNo(result.getOutRefundNo());
         if (null == taPay) {
             log.error("退款通知处理失败: 单号 " + result.getOutRefundNo());
@@ -220,12 +232,33 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
             taOrder.setIsRefund(1);
             taOrder.setStatus(Constants.ORDER_CANCEL);
             taOrderMapper.updateById(taOrder);
-        }
-
-        // 插入账户流水
-        // 暂无
 
+            // 插入账户流水
+            insertAccount(taPay, taOrder.getOrgId(),Constants.ACCOUNT_EXPEND, Constants.ACCOUNT_ORDER_REFUND);
+        }
     }
 
+    private void insertAccount(TaPay taPay, String orgId, Integer feeType, String chargeType) throws Exception {
+        TaAccount taAccount = iTaAccountService.getUserAccount(orgId);
+        String accountId = taAccount.getAccountId();
+
+        TaAccountLog accountLog = new TaAccountLog();
+        accountLog.setAccountId(accountId);
+        accountLog.setFeeType(feeType);
+        accountLog.setChargeType(chargeType);
+        accountLog.setMoney(taPay.getCharges());
+        accountLog.setOrderId(taPay.getOrderId());
+        accountLog.setPayId(taPay.getPayId());
+        accountLog.setCreateDate(LocalDateTime.now());
+        taAccountLogMapper.insert(accountLog);
+
+        // 累计余额
+        taAccountMapper.updateColumn(accountId, "amounts", Math.abs(taPay.getCharges()) * feeType);
+
+        // 累计支出
+        if (feeType == Constants.ACCOUNT_EXPEND) {
+            taAccountMapper.updateColumn(accountId, "paid_fee", Math.abs(taPay.getCharges()));
+        }
+    }
 
 }

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

@@ -34,10 +34,14 @@ public class TaPersonServiceImpl extends BaseServiceImpl<TaPersonMapper, TaPerso
         if (null == taPerson) return;
 
         try {
-            if (!StringUtils.isEmpty(taPerson.getPhone()) && StringUtils.isEmpty(taPerson.getUserId())) {
-                // 尝试去绑定农机手人员
+            if (!StringUtils.isEmpty(taPerson.getPhone())) {
                 SysUser sysUser = sysUserMapper.selectByPhone(taPerson.getPhone());
-                if (null != sysUser) {
+                if (null != sysUser && sysUser.getUserId().equals(taPerson.getUserId())) {
+                    taPerson.setIsOrgManager(sysUser.getIsOrgManager());
+                }
+
+                // 尝试去绑定农机手人员
+                if (StringUtils.isEmpty(taPerson.getUserId())) {
                     taPerson.setUserId(sysUser.getUserId());
                     updateById(taPerson);
                 }

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

@@ -1,11 +1,14 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.entity.TaWithdrawal;
 import com.yunzhi.nanyang.mapper.TaWithdrawalMapper;
 import com.yunzhi.nanyang.service.ITaWithdrawalService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 提现表 服务实现类
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaWithdrawalServiceImpl extends BaseServiceImpl<TaWithdrawalMapper, TaWithdrawal> implements ITaWithdrawalService {
 
+    @Override
+    public IPage<TaWithdrawal> getPageBy(IPage<TaWithdrawal> pg, String orgId, LocalDateTime startDate, LocalDateTime endDate) {
+        return baseMapper.getPageBy(pg, orgId, startDate, endDate);
+    }
 }

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

@@ -7,7 +7,6 @@ import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.entity.TaWorkJob;
 import com.yunzhi.nanyang.mapper.TaWorkJobMapper;
 import com.yunzhi.nanyang.service.ITaWorkJobService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -55,4 +54,17 @@ public class TaWorkJobServiceImpl extends BaseServiceImpl<TaWorkJobMapper, TaWor
     public TaWorkJob getDetailBy(String id) {
         return baseMapper.getDetailBy(id);
     }
+
+    @Override
+    public IPage<TaWorkJob> getAdminPageBy(IPage<TaWorkJob> pg,
+                                           String orgId,
+                                           LocalDateTime startDate,
+                                           LocalDateTime endDate,
+                                           Integer status,
+                                           String orderNo,
+                                           String machineryTypeId,
+                                           String machineryId,
+                                           String workerName) {
+        return baseMapper.getAdminPageBy(pg, orgId, startDate, endDate, status, orderNo, machineryTypeId, machineryId, workerName);
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.yunzhi.nanyang.service.impl;
+
+import com.yunzhi.nanyang.entity.TdBank;
+import com.yunzhi.nanyang.mapper.TdBankMapper;
+import com.yunzhi.nanyang.service.ITdBankService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 银行 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-04-10
+ */
+@Service
+public class TdBankServiceImpl extends ServiceImpl<TdBankMapper, TdBank> implements ITdBankService {
+
+}

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

@@ -0,0 +1,34 @@
+package com.yunzhi.nanyang.vo;
+
+import com.yunzhi.nanyang.entity.TaAccountLog;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel(description = "账户流水")
+public class AccountRecord extends TaAccountLog {
+
+    @ApiModelProperty(value = "下单人ID")
+    private String personId;
+
+    @ApiModelProperty(value = "下单人名称")
+    private String personName;
+
+    @ApiModelProperty(value = "下单人手机")
+    private String phone;
+
+    @ApiModelProperty(value = "商品描述")
+    private String description;
+
+    @ApiModelProperty(value = "支付时间")
+    private LocalDateTime payDate;
+
+    @ApiModelProperty(value = "订单ID")
+    private String realOrderId;
+
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+}

src/main/resources/mapper/SysMenuMapper.xml

@@ -9,14 +9,16 @@
             1 AS can_access
         </if>
         <if test="!isAdmin">
-            IF ( m.role_id IS NULL, 0, 1 ) AS can_access
+            IF ( s.role_id IS NULL, 0, 1 ) AS can_access
         </if>
         FROM
             sys_menu t
         <if test="!isAdmin">
-                LEFT JOIN sys_role_permission s ON s.permission_id = t.menu_id
-                LEFT JOIN sys_user_role m ON m.role_id = s.role_id
-                AND m.user_id = #{userId}
+            LEFT JOIN (
+                SELECT a.*
+                FROM sys_role_permission a
+                INNER JOIN sys_user_role b ON a.role_id = b.role_id AND b.user_id = #{userId}
+            ) s ON s.permission_id = t.menu_id
         </if>
         WHERE
             t.`status` = 1

src/main/resources/mapper/TaAccountLogMapper.xml

@@ -2,4 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.TaAccountLogMapper">
 
+    <select id="getPageBy" resultType="com.yunzhi.nanyang.vo.AccountRecord">
+        SELECT
+            t.*,
+            n.person_id,
+            n.nick_name as person_name,
+            n.phone,
+            m.order_id as real_order_id,
+            m.order_no,
+            s.description,
+            s.pay_date
+        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
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaAccountMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.TaAccountMapper">
 
+    <update id="updateColumn">
+        update ta_account
+        set ${columnName} = IFNULL(${columnName}, 0) + ${value}
+        where account_id = #{accountId}
+    </update>
 </mapper>

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

src/main/resources/mapper/TaDispatchMapper.xml

@@ -51,6 +51,10 @@
         <if test="phone != null and phone != ''">
             AND m.phone LIKE CONCAT( '%', #{phone}, '%' )
         </if>
+        <if test="isWarn">
+            AND t.dispatch_status = 0
+            AND t.work_status = 0
+        </if>
         ORDER BY
             t.dispatch_status ASC,
             t.create_date desc

src/main/resources/mapper/TaOrderMapper.xml

@@ -11,6 +11,9 @@
     <select id="getAdminPage" resultType="com.yunzhi.nanyang.entity.TaOrder">
         SELECT DISTINCT
             t.*,
+        <if test="isWarn">
+            d.worker_name as work_name,
+        </if>
             m.`name` as org_name,
             n.nick_name as person_name,
             n.phone as phone
@@ -22,11 +25,23 @@
             </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
+        <if test="isWarn">
+            LEFT JOIN ta_dispatch d ON d.order_id = t.order_id AND d.`status` &gt; -1
+        </if>
         WHERE
             t.`status` &gt; 0
+        <if test="isWarn">
+            AND TO_DAYS(t.appointment_date) = TO_DAYS(now())
+            AND t.pay_status = 1
+            AND t.dispatch_status = 1
+            AND t.work_status = 0
+        </if>
         <if test="orgId != null and orgId != ''">
             AND t.org_id = #{orgId}
         </if>
+        <if test="orderNo != null and orderNo != ''">
+            AND t.order_no LIKE CONCAT( '%', #{orderNo}, '%' )
+        </if>
         <if test="machineryId != null and machineryId != ''">
             AND t.machinery_id = #{machineryId}
         </if>

src/main/resources/mapper/TaWithdrawalMapper.xml

@@ -2,4 +2,34 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.nanyang.mapper.TaWithdrawalMapper">
 
+    <select id="getPageBy" resultType="com.yunzhi.nanyang.entity.TaWithdrawal">
+        SELECT
+            t.*,
+            s.`name` as org_name
+        FROM ta_withdrawal t
+        INNER JOIN ta_org s ON s.org_id = t.org_id
+        WHERE t.status &gt; -1
+            <if test="orgId != null and orgId != ''">
+                AND t.org_id = #{orgId}
+            </if>
+            <if test="startDate != null">
+                AND t.create_date &gt;= #{startDate}
+            </if>
+        <if test="endDate != null">
+            AND t.create_date &lt;= #{endDate}
+        </if>
+            ORDER BY t.create_date DESC
+    </select>
+    <select id="getTotalMoney" resultType="java.lang.Integer">
+        SELECT
+            SUM( t.money )
+        FROM
+            ta_withdrawal t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.status &gt; -1
+          <if test="auditStatus != null">
+              AND t.audit_status = #{auditStatus}
+          </if>
+    </select>
 </mapper>

src/main/resources/mapper/TaWorkJobMapper.xml

@@ -9,6 +9,11 @@
             n.nick_name AS person_name,
             n.phone,
             s.machinery_name,
+            s.org_name,
+            s.worker_name,
+            s.type_id as machinery_type_id,
+            s.type_name as machinery_type_name,
+            m.order_no,
             m.appointment_date,
             m.create_date AS order_date,
             m.address,
@@ -36,4 +41,30 @@
         WHERE
             t.job_id = #{id}
     </select>
+    <select id="getAdminPageBy" resultType="com.yunzhi.nanyang.entity.TaWorkJob">
+        <include refid="getSummaryOfWork"></include>
+        WHERE
+        t.`status` = #{status}
+        <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="startDate != null and endDate != null">
+            AND t.end_date &gt;= #{startDate}
+            AND t.start_date &lt;= #{endDate}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            AND m.order_no LIKE CONCAT('%', #{orderNo}, '%')
+        </if>
+        <if test="machineryTypeId != null and machineryTypeId != ''">
+            AND s.type_id = #{machineryTypeId}
+        </if>
+        <if test="workerName != null and workerName != ''">
+            AND s.worker_name LIKE CONCAT('%', #{workerName}, '%')
+        </if>
+        ORDER BY
+        t.create_date DESC
+    </select>
 </mapper>

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