* 功能优化

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgOrderController.java

@@ -427,12 +427,12 @@ public class TaOrgOrderController extends BaseController {
      *
      * @param pageNum
      * @param pageSize
-     * @param startTime   消费开始时间
-     * @param endTime     消费结束时间
-     * @param orderId     订单编号
-     * @param status      消费状态，1：成功，0：失败
-     * @param consumeType 消费方式，红包：redPacket
-     * @param phone       接收人手机号
+     * @param startTime     消费开始时间
+     * @param endTime       消费结束时间
+     * @param orderId       订单编号
+     * @param tradingStatus success:成功；fail:失败
+     * @param consumeType   消费方式，红包：redPacket
+     * @param phone         接收人手机号
      * @param request
      * @return
      */
@@ -444,13 +444,13 @@ public class TaOrgOrderController extends BaseController {
                                                     String orderId,
                                                     String wxOrderId,
                                                     String tradeNo,
-                                                    Integer status,
+                                                    String tradingStatus,
                                                     String consumeType,
                                                     String phone,
                                                     HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaOrgOrderService.listConsumeOrderByCondition(pageNum, pageSize, startTime, endTime, orderId, status, consumeType, phone, wxOrderId, tradeNo, getOrgId(request));
+            responseBean = iTaOrgOrderService.listConsumeOrderByCondition(pageNum, pageSize, startTime, endTime, orderId, tradingStatus, consumeType, phone, wxOrderId, tradeNo, getOrgId(request));
         } catch (Exception e) {
             logger.error("listConsumeOrderByCondition -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -465,7 +465,7 @@ public class TaOrgOrderController extends BaseController {
      * @param startTime
      * @param endTime
      * @param orderId
-     * @param status
+     * @param tradingStatus success:成功；fail:失败
      * @param consumeType
      * @param phone
      * @param request
@@ -478,13 +478,13 @@ public class TaOrgOrderController extends BaseController {
                                               String orderId,
                                               String wxOrderId,
                                               String tradeNo,
-                                              Integer status,
+                                              String tradingStatus,
                                               String consumeType,
                                               String phone,
                                               HttpServletRequest request,
                                               HttpServletResponse response) throws Exception {
         try {
-            iTaOrgOrderService.exportConsumeOrderByCondition(startTime, endTime, orderId, status, consumeType, phone, wxOrderId, tradeNo, getOrgId(request), response);
+            iTaOrgOrderService.exportConsumeOrderByCondition(startTime, endTime, orderId, tradingStatus, consumeType, phone, wxOrderId, tradeNo, getOrgId(request), response);
         } catch (Exception e) {
             logger.error("exportConsumeOrderByCondition 异常：", e);
             response.reset();

src/main/java/com/huiju/estateagents/redpack/controller/TaRedPacketController.java

@@ -168,7 +168,7 @@ public class TaRedPacketController extends BaseController {
      * @param wxOrderId
      * @param tradeNo
      * @param phone
-     * @param status
+     * @param tradingStatus
      * @param request
      * @return
      */
@@ -180,11 +180,11 @@ public class TaRedPacketController extends BaseController {
                                        String wxOrderId,
                                        String tradeNo,
                                        String phone,
-                                       Integer status,
+                                       String tradingStatus,
                                        HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaOrgOrderService.listRedPacketRecords(pageNum, pageSize, phone, activityId, orderId, wxOrderId, tradeNo, status, getOrgId(request));
+            responseBean = iTaOrgOrderService.listRedPacketRecords(pageNum, pageSize, phone, activityId, orderId, wxOrderId, tradeNo, tradingStatus, getOrgId(request));
         } catch (Exception e) {
             logger.error("listSendRecord -=- {}", e);
             responseBean.addError(e.getMessage());

src/main/java/com/huiju/estateagents/redpack/mapper/TaOrgOrderMapper.java

@@ -202,7 +202,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                            @Param("orderId") String orderId,
                                            @Param("wxOrderId") String wxOrderId,
                                            @Param("tradeNo") String tradeNo,
-                                           @Param("status") Integer status,
+                                           @Param("tradingStatus") String tradingStatus,
                                            @Param("orgId") Integer orgId);
 
     /**
@@ -212,7 +212,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @param startTime
      * @param endTime
      * @param orderId
-     * @param status
+     * @param tradingStatus
      * @param consumeType
      * @param phone
      * @param orgId
@@ -222,7 +222,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                                   @Param("startTime") LocalDate startTime,
                                                   @Param("endTime") LocalDate endTime,
                                                   @Param("orderId") String orderId,
-                                                  @Param("status") Integer status,
+                                                  @Param("tradingStatus") String tradingStatus,
                                                   @Param("consumeType") String consumeType,
                                                   @Param("phone") String phone,
                                                   @Param("wxOrderId") String wxOrderId,
@@ -235,7 +235,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @param startTime
      * @param endTime
      * @param orderId
-     * @param status
+     * @param tradingStatus
      * @param consumeType
      * @param phone
      * @param orgId
@@ -244,7 +244,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
     List<AccountConsumeRecordExport> exportConsumeOrderByCondition(@Param("startTime") LocalDate startTime,
                                                                    @Param("endTime") LocalDate endTime,
                                                                    @Param("orderId") String orderId,
-                                                                   @Param("status") Integer status,
+                                                                   @Param("tradingStatus") String tradingStatus,
                                                                    @Param("consumeType") String consumeType,
                                                                    @Param("phone") String phone,
                                                                    @Param("wxOrderId") String wxOrderId,

src/main/java/com/huiju/estateagents/redpack/service/ITaOrgOrderService.java

@@ -155,11 +155,11 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @param orderId
      * @param wxOrderId
      * @param tradeNo
-     * @param status
+     * @param tradingStatus
      * @param orgId
      * @return
      */
-    ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone, String activityId, String orderId, String wxOrderId, String tradeNo, Integer status, Integer orgId);
+    ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone, String activityId, String orderId, String wxOrderId, String tradeNo, String tradingStatus, Integer orgId);
 
     /**
      * 获取消费订单列表
@@ -169,13 +169,13 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @param startTime
      * @param endTime
      * @param orderId
-     * @param status
+     * @param tradingStatus
      * @param consumeType
      * @param phone
      * @param orgId
      * @return
      */
-    ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, Integer status,
+    ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, String tradingStatus,
                                              String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId);
 
     /**
@@ -184,12 +184,12 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @param startTime
      * @param endTime
      * @param orderId
-     * @param status
+     * @param tradingStatus
      * @param consumeType
      * @param phone
      * @param orgId
      * @param response
      * @throws Exception
      */
-    void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception;
+    void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, String tradingStatus, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception;
 }

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgAccountServiceImpl.java

@@ -221,6 +221,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
 
         // 计算退款冻结金额
         orgAccount.setRefundBlockedAmount(taOrgRefundApplicationMapper.countRefundBlockedAmount(orgId));
+        orgAccount.setTotalRechargeAmount(taOrgOrderMapper.countTotalRechargeAmount(orgId));
         responseBean.addSuccess(orgAccount);
         return responseBean;
     }

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java

@@ -82,6 +82,9 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     @Autowired
     private TaOrgAccountCertificateMapper taOrgAccountCertificateMapper;
 
+    @Autowired
+    private TaUserMapper taUserMapper;
+
     @Autowired
     private SysUserMapper sysUserMapper;
 
@@ -173,7 +176,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         ResponseBean responseBean = new ResponseBean();
 
         // 获取下单人名称
-        SysUser taUser = sysUserMapper.selectById(userId);
+        TaUser taUser = taUserMapper.selectById(userId);
         if (taUser == null) {
             responseBean.addError("fail");
             return responseBean;
@@ -237,13 +240,29 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         ResponseBean responseBean = new ResponseBean();
 
         // 获取下单人名称
-        SysUser taUser = sysUserMapper.selectById(userId);
+        TaUser taUser = taUserMapper.selectById(userId);
         if (taUser == null) {
             responseBean.addError("fail");
             return responseBean;
         }
 
-        // 1.创建订单主表信息
+        // 查询账户信息
+        QueryWrapper<TaOrgAccount> orgAccountQueryWrapper = new QueryWrapper<>();
+        orgAccountQueryWrapper.eq("org_id",orgId);
+        orgAccountQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(orgAccountQueryWrapper);
+        if(taOrgAccount == null){
+            responseBean.addError("账户不存在");
+            return responseBean;
+        }
+
+        // 1.校验账户金额
+        if(amount > CommonUtils.fenToYuan(taOrgAccount.getAvailableBalance())){
+            responseBean.addError("账户可用余额不足，请稍后再试");
+            return responseBean;
+        }
+
+        // 2.创建订单主表信息
         TaOrgOrder taOrgOrder = new TaOrgOrder();
         taOrgOrder.setOrgId(orgId);
         taOrgOrder.setTradeNo(CommonUtils.generateTradeNo(CommConstant.REFUND));
@@ -261,7 +280,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
-        // 2.创建订单详情表信息
+        // 3.创建订单详情表信息
         TaOrgOrderDetail taOrgOrderDetail = new TaOrgOrderDetail();
         taOrgOrderDetail.setOrderId(taOrgOrder.getOrderId());
         taOrgOrderDetail.setOrgId(orgId);
@@ -276,7 +295,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
-        // 3.创建账户退款申请表信息
+        // 4.创建账户退款申请表信息
         TaOrgRefundApplication taOrgRefundApplication = new TaOrgRefundApplication();
         taOrgRefundApplication.setOrgId(orgId);
         taOrgRefundApplication.setUserId(userId);
@@ -356,26 +375,26 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @Override
-    public ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone, String activityId, String orderId, String wxOrderId, String tradeNo, Integer status, Integer orgId) {
+    public ResponseBean listRedPacketRecords(Integer pageNum, Integer pageSize, String phone, String activityId, String orderId, String wxOrderId, String tradeNo, String tradingStatus, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
-        responseBean.addSuccess(taOrgOrderMapper.listRedPacketRecords(pg, phone, activityId, orderId, wxOrderId, tradeNo, status, orgId));
+        responseBean.addSuccess(taOrgOrderMapper.listRedPacketRecords(pg, phone, activityId, orderId, wxOrderId, tradeNo, tradingStatus, orgId));
         return responseBean;
     }
 
     @Override
-    public ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId) {
+    public ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, String tradingStatus, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
-        responseBean.addSuccess(taOrgOrderMapper.listConsumeOrderByCondition(pg, startTime, endTime, orderId, status, consumeType, phone, wxOrderId, tradeNo, orgId));
+        responseBean.addSuccess(taOrgOrderMapper.listConsumeOrderByCondition(pg, startTime, endTime, orderId, tradingStatus, consumeType, phone, wxOrderId, tradeNo, orgId));
         return responseBean;
     }
 
     @Override
-    public void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception {
+    public void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, String tradingStatus, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
-        List<AccountConsumeRecordExport> records = taOrgOrderMapper.exportConsumeOrderByCondition(startTime, endTime, orderId, status, consumeType, wxOrderId, tradeNo, phone, orgId);
+        List<AccountConsumeRecordExport> records = taOrgOrderMapper.exportConsumeOrderByCondition(startTime, endTime, orderId, tradingStatus, consumeType, wxOrderId, tradeNo, phone, orgId);
         String fileName = URLEncoder.encode("消费订单", "UTF-8");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
         EasyExcel.write(response.getOutputStream(), AccountConsumeRecordExport.class).sheet("消费订单").doWrite(records);

src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java

@@ -234,7 +234,7 @@ public class TaContactController extends BaseController {
     @RequestMapping(value = "/admin/listContactByCondition", method = RequestMethod.GET)
     public ResponseBean listContactByConditionForAdmin(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                       String contactName, String telephone, String phone, String job, String contactType) {
+                                                       String contactName, String telephone, String phone, String job) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -244,7 +244,7 @@ public class TaContactController extends BaseController {
             queryWrapper.like(!StringUtils.isEmpty(telephone), "telephone", telephone);
             queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
             queryWrapper.like(!StringUtils.isEmpty(job), "job", job);
-            queryWrapper.like(!StringUtils.isEmpty(contactType), "contact_type", contactType);
+            queryWrapper.like("contact_type", CommConstant.FINANCE);
             queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("order_no", "create_date");
 
@@ -286,8 +286,8 @@ public class TaContactController extends BaseController {
     /**
      * 删除财务联系人
      */
-    @RequestMapping(value="/channel/taContactFinanceDel",method= RequestMethod.PUT)
-    public ResponseBean taContactInfoAdd(@RequestBody List<TaContact> taContacts){
+    @RequestMapping(value = "/channel/taContactFinanceDel", method = RequestMethod.PUT)
+    public ResponseBean taContactInfoAdd(@RequestBody List<TaContact> taContacts) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taContacts.forEach(e -> {
@@ -298,9 +298,9 @@ public class TaContactController extends BaseController {
             } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactInfoAdd -=- {}",e.toString());
+            logger.error("taContactInfoAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

src/main/resources/mapper/redpack/TaOrgOrderMapper.xml

@@ -219,7 +219,7 @@
             <if test = " payEndTime != null ">
                 AND t.pay_date &lt;= #{payEndTime}
             </if>
-            <if test = " tradingStatus != null">
+            <if test = " tradingStatus != null and tradingStatus != ''">
                 AND t.trading_status = #{tradingStatus}
             </if>
         ORDER BY
@@ -258,7 +258,7 @@
             <if test = " payEndTime != null ">
                 AND t.pay_date &lt;= #{payEndTime}
             </if>
-            <if test = " tradingStatus != null">
+            <if test = " tradingStatus != null and tradingStatus != '' ">
                 AND t.trading_status = #{tradingStatus}
             </if>
         ORDER BY
@@ -367,8 +367,8 @@
             <if test = " wxOrderId != null and wxOrderId != ''">
                 AND t.wx_order_id like concat ('%',#{wxOrderId},'%')
             </if>
-            <if test="status != null">
-                AND t.status = #{status}
+            <if test="tradingStatus != null and tradingStatus != ''">
+                AND t.trading_status = #{tradingStatus}
             </if>
             <if test = "phone != null and phone != ''">
                 AND t3.phone like concat ('%',phone,'%')
@@ -412,11 +412,16 @@
             <if test = " endTime != null">
                 AND t.create_date &lt;= #{endTime}
             </if>
-            <if test = " status != null">
-                AND t2.status = #{status}
-            </if>
+            <choose>
+                <when test="tradingStatus == 'success'">
+                    AND t.trading_status = 'success'
+                </when>
+                <when test = "tradingStatus == 'fail'">
+                    AND t.trading_status == 'fail'
+                </when>
+            </choose>
             <if test = "phone != null and phone != ''">
-                AND t3.phone = #{phone}
+                AND t3.phone like concat('%',#{phone},'%')
             </if>
         ORDER BY
             t.create_date DESC
@@ -462,11 +467,16 @@
             <if test = " endTime != null">
                 AND t.create_date &lt;= #{endTime}
             </if>
-            <if test = " status != null">
-                AND t2.status = #{status}
-            </if>
+            <choose>
+                <when test="tradingStatus == 'success'">
+                    AND t.trading_status = 'success'
+                </when>
+                <when test = "tradingStatus == 'fail'">
+                    AND t.trading_status == 'fail'
+                </when>
+            </choose>
             <if test = "phone != null and phone != ''">
-                AND t3.phone = #{phone}
+                AND t3.phone like concat('%',#{phone},'%')
             </if>
         ORDER BY
             t.create_date DESC

src/main/resources/mapper/redpack/TaOrgRefundApplicationMapper.xml

@@ -10,7 +10,8 @@
             ta_org_refund_application t
         WHERE
             t.org_id = #{orgId}
-            AND t.`status` = 0
+            AND t.`status` = 1
+            AND t.audit_status = 'checking'
     </select>
 
 </mapper>