Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -574,6 +574,11 @@ public class CommConstant {
      */
     public static final String RED_PACKET = "RedPacket";
 
+    /**
+     * 套餐类型标识
+     */
+    public static final String PACKAGE = "Package";
+
     /**
      * 系统参数  通知消息次时间间隔
      */

src/main/java/com/huiju/estateagents/excel/redPacket/AccountConsumeRecordExport.java

@@ -19,7 +19,7 @@ public class AccountConsumeRecordExport {
 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "消费金额（元）", index = 1)
+    @ExcelProperty(value = "金额（元）", index = 1)
     private String amount;
 
 
@@ -33,7 +33,7 @@ public class AccountConsumeRecordExport {
     private String activityName;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "消费下单时间", index = 4)
+    @ExcelProperty(value = "下单时间", index = 4)
     private String createDate;
 
 

src/main/java/com/huiju/estateagents/excel/redPacket/AccountPayRecordExport.java

@@ -19,7 +19,7 @@ public class AccountPayRecordExport {
 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "充值金额（元）", index = 1)
+    @ExcelProperty(value = "金额（元）", index = 1)
     private String amount;
 
 

src/main/java/com/huiju/estateagents/miniPackage/entity/TaUserPackages.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.miniPackage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -74,5 +75,32 @@ public class TaUserPackages implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 支付方式
+     */
+    private Integer payType;
 
+    /**
+     * 套餐名称
+     */
+    @TableField(exist = false)
+    private String standName;
+
+    /**
+     * 显示名称
+     */
+    @TableField(exist = false)
+    private String name;
+
+    /**
+     * 套餐价格 单位分
+     */
+    @TableField(exist = false)
+    private Integer price;
+
+    /**
+     * 时长
+     */
+    @TableField(exist = false)
+    private Integer amount;
 }

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

@@ -99,14 +99,14 @@ public class TaOrgOrderController extends BaseController {
      */
     @RequestMapping(value = "/channel/taOrgOrder/rechargeOrderExport")
     public void rechargeOrderExport(@RequestParam(value = "tradeNo", required = false) String tradeNo,
-                                                   @RequestParam(value = "isOffline", required = false) Boolean isOffline,
-                                                   @RequestParam(value = "tradingStatus", required = false) String tradingStatus,
-                                                   @RequestParam(value = "miniAppName", required = false) String miniAppName,
-                                                   @RequestParam(value = "startDate", required = false) String startDate,
-                                                   @RequestParam(value = "endDate", required = false) String endDate,
-                                                   @RequestParam(value = "orderType", required = false) String orderType,
-                                                   @RequestParam(value = "orgId", required = false) Integer orgId,
-                                                   HttpServletRequest request, HttpServletResponse response) throws IOException {
+                                    @RequestParam(value = "isOffline", required = false) Boolean isOffline,
+                                    @RequestParam(value = "tradingStatus", required = false) String tradingStatus,
+                                    @RequestParam(value = "miniAppName", required = false) String miniAppName,
+                                    @RequestParam(value = "startDate", required = false) String startDate,
+                                    @RequestParam(value = "endDate", required = false) String endDate,
+                                    @RequestParam(value = "orderType", required = false) String orderType,
+                                    @RequestParam(value = "orgId", required = false) Integer orgId,
+                                    HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=订单统计.xlsx");
@@ -157,13 +157,13 @@ public class TaOrgOrderController extends BaseController {
      */
     @RequestMapping(value = "/channel/taOrgOrder/refundOrderExport")
     public void refundOrderExport(@RequestParam(value = "tradeNo", required = false) String tradeNo,
-                                   @RequestParam(value = "miniAppName", required = false) String miniAppName,
-                                   @RequestParam(value = "startDate", required = false) String startDate,
-                                   @RequestParam(value = "endDate", required = false) String endDate,
-                                   @RequestParam(value = "orderType", required = false) String orderType,
-                                   @RequestParam(value = "orgId", required = false) Integer orgId,
-                                   @RequestParam(value = "auditStatus", required = false) String auditStatus,
-                                   HttpServletRequest request, HttpServletResponse response) throws IOException {
+                                  @RequestParam(value = "miniAppName", required = false) String miniAppName,
+                                  @RequestParam(value = "startDate", required = false) String startDate,
+                                  @RequestParam(value = "endDate", required = false) String endDate,
+                                  @RequestParam(value = "orderType", required = false) String orderType,
+                                  @RequestParam(value = "orgId", required = false) Integer orgId,
+                                  @RequestParam(value = "auditStatus", required = false) String auditStatus,
+                                  HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=订单统计.xlsx");
@@ -269,7 +269,6 @@ public class TaOrgOrderController extends BaseController {
 
     /**
      * 查询接收人信息
-     *
      */
     @RequestMapping(value = "/channel/receiveInfo", method = RequestMethod.GET)
     public ResponseBean receiveInfoGet(@RequestParam(required = false) String phone,
@@ -559,4 +558,44 @@ public class TaOrgOrderController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 根据tradeNo获取订单详情
+     *
+     * @param tradeNo
+     * @param orgId
+     * @return
+     */
+    @RequestMapping(value = "/channel/taOrgOrder/getOrderDetailByTradeNo", method = RequestMethod.GET)
+    public ResponseBean getOrderDetailByTradeNo(String tradeNo, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.getOrderDetailByTradeNo(tradeNo, orgId);
+        } catch (Exception e) {
+            logger.error("getOrderDetailByTradeNo 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据tradeNo获取订单详情
+     *
+     * @param tradeNo
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/getOrderDetailByTradeNo", method = RequestMethod.GET)
+    public ResponseBean getOrderDetailByTradeNoForAdmin(String tradeNo, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.getOrderDetailByTradeNo(tradeNo, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("getOrderDetailByTradeNo 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
 }

src/main/java/com/huiju/estateagents/redpack/entity/ConsumeOrder.java

@@ -27,7 +27,7 @@ public class ConsumeOrder {
      * 消费金额
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "消费金额", index = 2)
+    @ExcelProperty(value = "金额", index = 2)
     private String amount;
 
     /**
@@ -48,7 +48,7 @@ public class ConsumeOrder {
      * 消费下单时间
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "消费下单时间", index = 5)
+    @ExcelProperty(value = "下单时间", index = 5)
     private String createDate;
 
     /**

src/main/java/com/huiju/estateagents/redpack/entity/RechargeOrder.java

@@ -20,14 +20,14 @@ public class RechargeOrder {
      * 充值组织
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "充值组织", index = 1)
+    @ExcelProperty(value = "公司", index = 1)
     private String miniAppName;
 
     /**
      * 充值金额
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "充值金额", index = 2)
+    @ExcelProperty(value = "金额", index = 2)
     private String amount;
 
     /**

src/main/java/com/huiju/estateagents/redpack/entity/TaOrgOrder.java

@@ -172,4 +172,16 @@ public class TaOrgOrder implements Serializable {
     @TableField(exist = false)
     private String name;
 
+    /**
+     * 对象ID
+     */
+    @TableField(exist = false)
+    private String targetId;
+
+    /**
+     * 消费类型信息（红包活动/套餐详情）
+     */
+    @TableField(exist = false)
+    private Object consumeInfo;
+
 }

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

@@ -72,13 +72,13 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @return
      */
     List<RechargeOrder> rechargeListByConditionExport(@Param("itemType") String itemType,
-                                                          @Param("tradeNo") String tradeNo,
-                                                          @Param("isOffline") Boolean isOffline,
-                                                          @Param("tradingStatus") String tradingStatus,
-                                                          @Param("startDate") String startDate,
-                                                          @Param("endDate") String endDate,
-                                                          @Param("miniAppName") String miniAppName,
-                                                          @Param("orgId") Integer orgId);
+                                                      @Param("tradeNo") String tradeNo,
+                                                      @Param("isOffline") Boolean isOffline,
+                                                      @Param("tradingStatus") String tradingStatus,
+                                                      @Param("startDate") String startDate,
+                                                      @Param("endDate") String endDate,
+                                                      @Param("miniAppName") String miniAppName,
+                                                      @Param("orgId") Integer orgId);
 
     /**
      * 消费订单导出
@@ -278,4 +278,14 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
     Map<String, Object> getRedPacketSendInfo(@Param("targetType") String targetType,
                                              @Param("targetId") String targetId,
                                              @Param("orgId") Integer orgId);
+
+    /**
+     * 根据tradeNo获取订单详情
+     *
+     * @param tradeNo
+     * @param orgId
+     * @return
+     */
+    List<TaOrgOrder> getOrderDetailByTradeNo(@Param("tradeNo") String tradeNo,
+                                             @Param("orgId") Integer orgId);
 }

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

@@ -163,7 +163,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @param response
      * @throws Exception
      */
-    void exportRefundOrderByCondition(LocalDateTime refundStartTime, LocalDateTime refundEndTime, String orderId, String auditStatus, String wxOrderId,String tradeNo, Integer orgId, HttpServletResponse response) throws Exception;
+    void exportRefundOrderByCondition(LocalDateTime refundStartTime, LocalDateTime refundEndTime, String orderId, String auditStatus, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception;
 
     /**
      * 条件查询红包发送记录
@@ -210,4 +210,13 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @throws Exception
      */
     void exportConsumeOrderByCondition(LocalDateTime startTime, LocalDateTime endTime, String orderId, String tradingStatus, String consumeType, String phone, String wxOrderId, String tradeNo, Integer orgId, HttpServletResponse response) throws Exception;
+
+    /**
+     * 根据tradeNo查询订单详情
+     *
+     * @param tradeNo
+     * @param orgId
+     * @return
+     */
+    ResponseBean getOrderDetailByTradeNo(String tradeNo, Integer orgId);
 }

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

@@ -20,7 +20,12 @@ import com.huiju.estateagents.entity.TaWxPayConfig;
 import com.huiju.estateagents.excel.redPacket.AccountConsumeRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountPayRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountRefundRecordExport;
+import com.huiju.estateagents.mapper.TaOrgMapper;
 import com.huiju.estateagents.mapper.TaWxPayConfigMapper;
+import com.huiju.estateagents.miniPackage.entity.SysVipPackage;
+import com.huiju.estateagents.miniPackage.entity.TaUserPackages;
+import com.huiju.estateagents.miniPackage.mapper.SysVipPackageMapper;
+import com.huiju.estateagents.miniPackage.mapper.TaUserPackagesMapper;
 import com.huiju.estateagents.redpack.entity.*;
 import com.huiju.estateagents.redpack.mapper.*;
 import com.huiju.estateagents.redpack.service.ITaOrgAccountService;
@@ -95,10 +100,16 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     private TaWxPayConfigMapper taWxPayConfigMapper;
 
     @Autowired
-    private TaContactMapper taContactMapper;
+    private ITaOrgAccountService taOrgAccountService;
 
     @Autowired
-    private ITaOrgAccountService taOrgAccountService;
+    private TaRedPacketMapper taRedPacketMapper;
+
+    @Autowired
+    private TaUserPackagesMapper taUserPackagesMapper;
+
+    @Autowired
+    private SysVipPackageMapper sysVipPackageMapper;
 
     @Override
     public IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg,
@@ -158,7 +169,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         return urlList;
     }
 
-    public Integer calculateAvailableAmount(Integer orgId){
+    public Integer calculateAvailableAmount(Integer orgId) {
         TaOrgAccount taOrgAccount = taOrgAccountMapper.getOrgAccountById(orgId);
 
         //查询总充值金额
@@ -172,6 +183,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
         return balance;
     }
+
     /**
      * 微信支付
      *
@@ -512,6 +524,46 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         EasyExcel.write(response.getOutputStream(), AccountConsumeRecordExport.class).sheet("消费订单").doWrite(records);
     }
 
+    @Override
+    public ResponseBean getOrderDetailByTradeNo(String tradeNo, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 查询订单信息
+        List<TaOrgOrder> orgOrders = taOrgOrderMapper.getOrderDetailByTradeNo(tradeNo,orgId);
+        if(CollectionUtils.isEmpty(orgOrders)){
+            responseBean.addError("订单不存在");
+            return responseBean;
+        }
+
+        TaOrgOrder orgOrder = orgOrders.get(0);
+
+        // 红包活动订单
+        if (CommConstant.RED_PACKET.equals(orgOrder.getConsumeType())) {
+            String activityId = orgOrder.getTargetId();
+            TaRedPacket taRedPacket = taRedPacketMapper.selectById(activityId);
+            if(null != taRedPacket){
+                orgOrder.setConsumeInfo(taRedPacket);
+            }
+        }
+
+        // 购买套餐订单
+        if (CommConstant.PACKAGE.equals(orgOrder.getConsumeType())) {
+            Integer userPackId = Integer.parseInt(orgOrder.getTargetId());
+            TaUserPackages taUserPackages = taUserPackagesMapper.selectById(userPackId);
+            if(null != taUserPackages){
+                SysVipPackage sysVipPackage = sysVipPackageMapper.selectById(taUserPackages.getPackId());
+                taUserPackages.setStandName(sysVipPackage.getStandName());
+                taUserPackages.setName(sysVipPackage.getName());
+                taUserPackages.setPrice(sysVipPackage.getPrice());
+                taUserPackages.setAmount(sysVipPackage.getAmount());
+                orgOrder.setConsumeInfo(taUserPackages);
+            }
+        }
+
+        responseBean.addSuccess(orgOrder);
+        return responseBean;
+    }
+
     /**
      * 获取每个小程序独立的微信账户
      *

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

@@ -532,4 +532,23 @@
         and t3.org_id = #{orgId}
     </select>
 
+    <select id="getOrderDetailByTradeNo" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
+        SELECT
+            t.*,
+            t2.item_type consumeType,
+            t2.target_id,
+            t3.nickname,
+            t3.phone,
+            t3.name,
+            t4.name miniappName
+        FROM
+            ta_org_order t
+            INNER JOIN ta_org_order_detail t2 ON t.order_id = t2.order_id
+            LEFT JOIN ta_person t3 ON t2.receiver_id = t3.person_id
+            LEFT JOIN ta_org t4 ON t.org_id = t4.org_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.trade_no = #{tradeNo}
+    </select>
+
 </mapper>