* 功能优化

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -891,4 +891,9 @@ public class CommConstant {
      * 审核状态-审核中
      */
     public static final String CHECK_STATUS_CHECKING = "checking";
+
+    /**
+     * 微信商户手续费率
+     */
+    public static final Double WXMCH_PAY_RATE = 0.01;
 }

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

@@ -100,6 +100,7 @@ public class TaOrgOrderController extends BaseController {
 
     /**
      * 订单导出
+     *
      * @return
      */
     @GetMapping(value = "/channel/taOrgOrder/orgOrderExport")
@@ -118,11 +119,11 @@ public class TaOrgOrderController extends BaseController {
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=订单统计.xlsx");
         ExcelWriter excelWriter = null;
-        if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType)){
+        if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType)) {
             excelWriter = EasyExcel.write(response.getOutputStream(), RechargeOrder.class).registerWriteHandler(new CustomCellWriteHandler()).build();
-        }else if (CommConstant.ITEM_TYPE_REFUND.equals(orderType)){
+        } else if (CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
             excelWriter = EasyExcel.write(response.getOutputStream(), RefundOrder.class).registerWriteHandler(new CustomCellWriteHandler()).build();
-        } else{
+        } else {
             excelWriter = EasyExcel.write(response.getOutputStream(), ConsumeOrder.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         }
 
@@ -370,11 +371,13 @@ public class TaOrgOrderController extends BaseController {
                                                    @RequestParam(value = "refundStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate refundStartTime,
                                                    @RequestParam(value = "refundEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate refundEndTime,
                                                    String orderId,
+                                                   String wxOrderId,
+                                                   String tradeNo,
                                                    String auditStatus,
                                                    HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaOrgOrderService.listRefundOrderByCondition(pageNum, pageSize, refundStartTime, refundEndTime, orderId, auditStatus, getOrgId(request));
+            responseBean = iTaOrgOrderService.listRefundOrderByCondition(pageNum, pageSize, refundStartTime, refundEndTime, orderId, auditStatus, wxOrderId, tradeNo, getOrgId(request));
         } catch (Exception e) {
             logger.error("refundOrder -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -396,11 +399,13 @@ public class TaOrgOrderController extends BaseController {
     public void exportRefundOrderByCondition(@RequestParam(value = "refundStartTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate refundStartTime,
                                              @RequestParam(value = "refundEndTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate refundEndTime,
                                              String orderId,
+                                             String wxOrderId,
+                                             String tradeNo,
                                              String auditStatus,
                                              HttpServletRequest request,
                                              HttpServletResponse response) throws Exception {
         try {
-            iTaOrgOrderService.exportRefundOrderByCondition(refundStartTime, refundEndTime, orderId, auditStatus, getOrgId(request), response);
+            iTaOrgOrderService.exportRefundOrderByCondition(refundStartTime, refundEndTime, orderId, auditStatus, wxOrderId, tradeNo, getOrgId(request), response);
         } catch (Exception e) {
             logger.error("exportRefundOrderByCondition 异常：", e);
             response.reset();
@@ -433,13 +438,15 @@ public class TaOrgOrderController extends BaseController {
                                                     @RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startTime,
                                                     @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endTime,
                                                     String orderId,
+                                                    String wxOrderId,
+                                                    String tradeNo,
                                                     Integer status,
                                                     String consumeType,
                                                     String phone,
                                                     HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaOrgOrderService.listConsumeOrderByCondition(pageNum, pageSize, startTime, endTime, orderId, status, consumeType, phone, getOrgId(request));
+            responseBean = iTaOrgOrderService.listConsumeOrderByCondition(pageNum, pageSize, startTime, endTime, orderId, status, consumeType, phone, wxOrderId, tradeNo, getOrgId(request));
         } catch (Exception e) {
             logger.error("listConsumeOrderByCondition -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -465,13 +472,15 @@ public class TaOrgOrderController extends BaseController {
     public void exportConsumeOrderByCondition(@RequestParam(value = "startTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startTime,
                                               @RequestParam(value = "endTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endTime,
                                               String orderId,
+                                              String wxOrderId,
+                                              String tradeNo,
                                               Integer status,
                                               String consumeType,
                                               String phone,
                                               HttpServletRequest request,
                                               HttpServletResponse response) throws Exception {
         try {
-            iTaOrgOrderService.exportConsumeOrderByCondition(startTime, endTime, orderId, status, consumeType, phone, getOrgId(request), response);
+            iTaOrgOrderService.exportConsumeOrderByCondition(startTime, endTime, orderId, status, consumeType, phone, wxOrderId, tradeNo, getOrgId(request), response);
         } catch (Exception e) {
             logger.error("exportConsumeOrderByCondition 异常：", e);
             response.reset();
@@ -484,5 +493,26 @@ public class TaOrgOrderController extends BaseController {
         }
     }
 
-
+    /**
+     * 根据订单号查询订单状态
+     *
+     * @param orderId
+     * @return
+     */
+    @RequestMapping(value = "getOrgOrderInfo", method = RequestMethod.GET)
+    public ResponseBean getOrgOrderInfo(String orderId) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaOrgOrder result = iTaOrgOrderService.getById(orderId);
+            if(result == null){
+                responseBean.addError("fail");
+                return responseBean;
+            }
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            logger.error("getOrgOrderInfo 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -83,13 +83,13 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @return
      */
     List<TaOrgOrder> orderListByConsumeExport(@Param("orderType") String orderType,
-                                         @Param("orgId") Integer orgId,
-                                         @Param("tradeNo") String tradeNo,
-                                         @Param("tradingStatus") String tradingStatus,
-                                         @Param("receivePhone") String receivePhone,
-                                         @Param("itemType") String itemType,
-                                         @Param("startDate") String startDate,
-                                         @Param("endDate") String endDate,
+                                              @Param("orgId") Integer orgId,
+                                              @Param("tradeNo") String tradeNo,
+                                              @Param("tradingStatus") String tradingStatus,
+                                              @Param("receivePhone") String receivePhone,
+                                              @Param("itemType") String itemType,
+                                              @Param("startDate") String startDate,
+                                              @Param("endDate") String endDate,
                                               @Param("miniAppName") String miniAppName);
 
     /**
@@ -153,6 +153,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                                  @Param("refundStartTime") LocalDate refundStartTime,
                                                  @Param("refundEndTime") LocalDate refundEndTime,
                                                  @Param("orderId") String orderId,
+                                                 @Param("wxOrderId") String wxOrderId,
+                                                 @Param("tradeNo") String tradeNo,
                                                  @Param("auditStatus") String auditStatus,
                                                  @Param("orgId") Integer orgId);
 
@@ -169,6 +171,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
     List<AccountRefundRecordExport> exportRefundOrderByCondition(@Param("refundStartTime") LocalDate refundStartTime,
                                                                  @Param("refundEndTime") LocalDate refundEndTime,
                                                                  @Param("orderId") String orderId,
+                                                                 @Param("wxOrderId") String wxOrderId,
+                                                                 @Param("tradeNo") String tradeNo,
                                                                  @Param("auditStatus") String auditStatus,
                                                                  @Param("orgId") Integer orgId);
 
@@ -221,6 +225,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                                   @Param("status") Integer status,
                                                   @Param("consumeType") String consumeType,
                                                   @Param("phone") String phone,
+                                                  @Param("wxOrderId") String wxOrderId,
+                                                  @Param("tradeNo") String tradeNo,
                                                   @Param("orgId") Integer orgId);
 
     /**
@@ -241,5 +247,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                                                    @Param("status") Integer status,
                                                                    @Param("consumeType") String consumeType,
                                                                    @Param("phone") String phone,
+                                                                   @Param("wxOrderId") String wxOrderId,
+                                                                   @Param("tradeNo") String tradeNo,
                                                                    @Param("orgId") Integer orgId);
 }

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

@@ -131,7 +131,8 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @param orgId
      * @return
      */
-    ResponseBean listRefundOrderByCondition(Integer pageNum, Integer pageSize, LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, Integer orgId);
+    ResponseBean listRefundOrderByCondition(Integer pageNum, Integer pageSize, LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, String wxOrderId,
+                                            String tradeNo, Integer orgId);
 
     /**
      * 导出退款订单列表
@@ -144,7 +145,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @param response
      * @throws Exception
      */
-    void exportRefundOrderByCondition(LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, Integer orgId, HttpServletResponse response) throws Exception;
+    void exportRefundOrderByCondition(LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, String wxOrderId,String tradeNo, Integer orgId, HttpServletResponse response) throws Exception;
 
     /**
      * 条件查询红包发送记录
@@ -175,7 +176,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @return
      */
     ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, Integer status,
-                                             String consumeType, String phone, Integer orgId);
+                                             String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId);
 
     /**
      * 导出消费订单列表
@@ -190,5 +191,5 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @param response
      * @throws Exception
      */
-    void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, Integer orgId, HttpServletResponse 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;
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.redpack.service.impl;
 
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -168,11 +169,14 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
+        // 计算支付金额
+        Double realAmount = amount * (amount * CommConstant.WXMCH_PAY_RATE);
+
         // 1.创建订单主表信息
         TaOrgOrder taOrgOrder = new TaOrgOrder();
         taOrgOrder.setOrgId(orgId);
         taOrgOrder.setTradeNo(CommonUtils.generateTradeNo(CommConstant.RECHARGE));
-        taOrgOrder.setAmount(CommonUtils.yuanToFen(amount));
+        taOrgOrder.setAmount(CommonUtils.yuanToFen(realAmount));
         taOrgOrder.setCreateDate(LocalDateTime.now());
         taOrgOrder.setStatus(CommConstant.STATUS_NORMAL);
         taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_PROCESSING);
@@ -189,8 +193,8 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         taOrgOrderDetail.setOrderId(taOrgOrder.getOrderId());
         taOrgOrderDetail.setOrgId(orgId);
         taOrgOrderDetail.setItemType(CommConstant.ITEM_TYPE_RECHARGE);
-        taOrgOrderDetail.setAmount(CommonUtils.yuanToFen(amount));
-        taOrgOrderDetail.setUnitPrice(CommonUtils.yuanToFen(amount));
+        taOrgOrderDetail.setAmount(CommonUtils.yuanToFen(realAmount));
+        taOrgOrderDetail.setUnitPrice(CommonUtils.yuanToFen(realAmount));
         taOrgOrderDetail.setQuantity(1);
         taOrgOrderDetail.setStatus(CommConstant.STATUS_NORMAL);
         if (taOrgOrderDetailMapper.insert(taOrgOrderDetail) < 1) {
@@ -200,7 +204,20 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         }
 
         // 3.请求微信接口获取支付二维码
-        return payUnifiedOrder(taOrgOrder, ip);
+        ResponseBean payResult = payUnifiedOrder(taOrgOrder, ip);
+        if (ResponseBean.CODE_SUCCESS != payResult.getCode()) {
+            return payResult;
+        }
+
+        JSONObject obj = new JSONObject();
+        obj.put("amount", amount);
+        obj.put("realAmount", realAmount);
+        obj.put("serviceFee", realAmount - amount);
+        obj.put("mchPayRate", CommConstant.WXMCH_PAY_RATE);
+        obj.put("payQrCode", payResult.getData());
+        obj.put("orderInfo", taOrgOrder);
+        responseBean.addSuccess(obj);
+        return responseBean;
     }
 
     @Override
@@ -263,7 +280,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
-        responseBean.addSuccess("success");
+        responseBean.addSuccess(taOrgOrder);
         return responseBean;
     }
 
@@ -297,10 +314,10 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @Override
-    public ResponseBean listRefundOrderByCondition(Integer pageNum, Integer pageSize, LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, Integer orgId) {
+    public ResponseBean listRefundOrderByCondition(Integer pageNum, Integer pageSize, LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, String wxOrderId, String tradeNo, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
-        pg = taOrgOrderMapper.listRefundOrderByCondition(pg, refundStartTime, refundEndTime, orderId, auditStatus, orgId);
+        pg = taOrgOrderMapper.listRefundOrderByCondition(pg, refundStartTime, refundEndTime, orderId, wxOrderId, tradeNo, auditStatus, orgId);
 
         if (CollectionUtils.isNotEmpty(pg.getRecords())) {
             pg.getRecords().stream().forEach(r -> {
@@ -315,10 +332,10 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @Override
-    public void exportRefundOrderByCondition(LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, Integer orgId, HttpServletResponse response) throws Exception {
+    public void exportRefundOrderByCondition(LocalDate refundStartTime, LocalDate refundEndTime, String orderId, String auditStatus, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
-        List<AccountRefundRecordExport> records = taOrgOrderMapper.exportRefundOrderByCondition(refundStartTime, refundEndTime, orderId, auditStatus, orgId);
+        List<AccountRefundRecordExport> records = taOrgOrderMapper.exportRefundOrderByCondition(refundStartTime, refundEndTime, orderId, wxOrderId, tradeNo, auditStatus, orgId);
         String fileName = URLEncoder.encode("退款订单", "UTF-8");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
         EasyExcel.write(response.getOutputStream(), AccountRefundRecordExport.class).sheet("退款订单").doWrite(records);
@@ -333,18 +350,18 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @Override
-    public ResponseBean listConsumeOrderByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, Integer orgId) {
+    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) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaOrgOrder> pg = new Page<>(pageNum, pageSize);
-        responseBean.addSuccess(taOrgOrderMapper.listConsumeOrderByCondition(pg, startTime, endTime, orderId, status, consumeType, phone, orgId));
+        responseBean.addSuccess(taOrgOrderMapper.listConsumeOrderByCondition(pg, startTime, endTime, orderId, status, consumeType, phone, wxOrderId, tradeNo, orgId));
         return responseBean;
     }
 
     @Override
-    public void exportConsumeOrderByCondition(LocalDate startTime, LocalDate endTime, String orderId, Integer status, String consumeType, String phone, Integer orgId, HttpServletResponse response) throws Exception {
+    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 {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
-        List<AccountConsumeRecordExport> records = taOrgOrderMapper.exportConsumeOrderByCondition(startTime, endTime, orderId, status, consumeType, phone, orgId);
+        List<AccountConsumeRecordExport> records = taOrgOrderMapper.exportConsumeOrderByCondition(startTime, endTime, orderId, status, 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/resources/mapper/redpack/TaOrgOrderMapper.xml

@@ -274,6 +274,12 @@
             <if test=" orderId != null and orderId != ''">
                 AND t.order_id like concat( '%',#{orderId},'%')
             </if>
+            <if test = " tradeNo != null and tradeNo != ''">
+                AND t.trade_no like concat( '%',#{tradeNo},'%')
+            </if>
+            <if test = " wxOrderId != null and wxOrderId != ''">
+                AND t.wx_order_id like concat ('%',#{wxOrderId},'%')
+            </if>
             <if test=" auditStatus != null and auditStatus != ''">
                 AND t3.audit_status = #{auditStatus}
             </if>
@@ -304,6 +310,12 @@
             <if test=" orderId != null and orderId != ''">
                 AND t.order_id like concat( '%',#{orderId},'%')
             </if>
+            <if test = " tradeNo != null and tradeNo != ''">
+                AND t.trade_no like concat( '%',#{tradeNo},'%')
+            </if>
+            <if test = " wxOrderId != null and wxOrderId != ''">
+                AND t.wx_order_id like concat ('%',#{wxOrderId},'%')
+            </if>
             <if test=" auditStatus != null and auditStatus != ''">
                 AND t3.audit_status = #{auditStatus}
             </if>
@@ -382,6 +394,12 @@
             <if test = " orderId != null and orderId != ''">
                 AND t.order_id like concat( '%',#{orderId},'%')
             </if>
+            <if test = " tradeNo != null and tradeNo != ''">
+                AND t.trade_no like concat( '%',#{tradeNo},'%')
+            </if>
+            <if test = " wxOrderId != null and wxOrderId != ''">
+                AND t.wx_order_id like concat ('%',#{wxOrderId},'%')
+            </if>
             <if test = " startTime != null ">
                 AND t.create_date &gt;= #{startTime}
             </if>
@@ -426,6 +444,12 @@
             <if test = " orderId != null and orderId != ''">
                 AND t.order_id like concat( '%',#{orderId},'%')
             </if>
+            <if test = " tradeNo != null and tradeNo != ''">
+                AND t.trade_no like concat( '%',#{tradeNo},'%')
+            </if>
+            <if test = " wxOrderId != null and wxOrderId != ''">
+                AND t.wx_order_id like concat ('%',#{wxOrderId},'%')
+            </if>
             <if test = " startTime != null ">
                 AND t.create_date &gt;= #{startTime}
             </if>