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

# Conflicts:
#	src/main/java/com/huiju/estateagents/common/CommConstant.java

src/main/java/com/huiju/estateagents/EstateagentsApplication.java

@@ -1,13 +1,11 @@
 package com.huiju.estateagents;
 
 import com.huiju.estateagents.websocket.ChatServer;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 
 @SpringBootApplication
-@MapperScan("com.baomidou.mybatisplus.samples.quickstart.mapper")
 public class EstateagentsApplication {
 
 	public static void main(String[] args) {

src/main/java/com/huiju/estateagents/bo/request/SaveCzOrderRequestBO.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 创建充值订单请求实体
+ *
+ * @author gusy
+ * @date 2020/6/9 14:58
+ */
+@Data
+public class SaveCzOrderRequestBO {
+
+    /**
+     * 充值金额
+     */
+    private String amount;
+}

src/main/java/com/huiju/estateagents/bo/request/SaveRefundOrderRequestBO.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 创建退款订单请求实体
+ *
+ * @author gusy
+ * @date 2020/6/9 14:58
+ */
+@Data
+public class SaveRefundOrderRequestBO {
+
+    /**
+     * 退款金额
+     */
+    private String amount;
+}

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

@@ -892,4 +892,13 @@ public class CommConstant {
      */
     public static final String CHECK_STATUS_CHECKING = "checking";
 
+    /**
+     * 微信商户手续费率
+     */
+    public static final Double WXMCH_PAY_RATE = 0.01;
+
+    /**
+     * 微信商户手续费率-前端展示
+     */
+    public static final String WXMCH_PAY_RATE_STRING = "1%";
 }

src/main/java/com/huiju/estateagents/drainage/service/impl/TaDrainageServiceImpl.java

@@ -111,6 +111,7 @@ public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrain
                     taRedPacket.setName(taDrainage.getName());
                     taRedPacket.setCreateDate(LocalDateTime.now());
                     taRedPacket.setStartDate(LocalDateTime.now().plusDays(1));
+                    taRedPacket.setQrcode(taDrainage.getQrCode());
                     taRedPacket.setEndDate(DateUtils.dayToLocalDateime(taDrainage.getEndDate()));
                     iTaRedPacketService.initializeRedPacket(taRedPacket);
 

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

@@ -14,6 +14,8 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
+import com.huiju.estateagents.bo.request.SaveCzOrderRequestBO;
+import com.huiju.estateagents.bo.request.SaveRefundOrderRequestBO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,6 +102,7 @@ public class TaOrgOrderController extends BaseController {
 
     /**
      * 订单导出
+     *
      * @return
      */
     @GetMapping(value = "/channel/taOrgOrder/orgOrderExport")
@@ -118,11 +121,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();
         }
 
@@ -249,15 +252,15 @@ public class TaOrgOrderController extends BaseController {
     /**
      * 创建充值订单
      *
-     * @param amount
+     * @param requestBO
      * @param request
      * @return
      */
     @RequestMapping(value = "/admin/orgOrder/cz/saveOrder", method = RequestMethod.PUT)
-    public ResponseBean saveCzOrder(@RequestParam(value = "amount") Double amount, HttpServletRequest request) {
+    public ResponseBean saveCzOrder(@RequestBody SaveCzOrderRequestBO requestBO, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaOrgOrderService.saveCzOrder(amount, getOrgId(request), getUserId(request), request.getRemoteAddr());
+            responseBean = iTaOrgOrderService.saveCzOrder(Double.parseDouble(requestBO.getAmount()), getOrgId(request), getUserId(request), request.getRemoteAddr());
         } catch (Exception e) {
             logger.error("saveCzOrder -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -268,15 +271,15 @@ public class TaOrgOrderController extends BaseController {
     /**
      * 创建退款订单
      *
-     * @param amount
+     * @param requestBO
      * @param request
      * @return
      */
     @RequestMapping(value = "/admin/orgOrder/refund/saveOrder", method = RequestMethod.PUT)
-    public ResponseBean saveRefundOrder(@RequestParam(value = "amount") Double amount, HttpServletRequest request) {
+    public ResponseBean saveRefundOrder(@RequestBody SaveRefundOrderRequestBO requestBO, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaOrgOrderService.saveRefundOrder(amount, getOrgId(request), getUserId(request));
+            responseBean = iTaOrgOrderService.saveRefundOrder(Double.parseDouble(requestBO.getAmount()), getOrgId(request), getUserId(request));
         } catch (Exception e) {
             logger.error("refundOrder -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -372,11 +375,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());
@@ -398,11 +403,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();
@@ -435,13 +442,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());
@@ -467,13 +476,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();
@@ -486,5 +497,26 @@ public class TaOrgOrderController extends BaseController {
         }
     }
 
-
+    /**
+     * 根据订单号查询订单状态
+     *
+     * @param orderId
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/getByInfo", 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/controller/TaRedPacketHelpController.java

@@ -111,8 +111,7 @@ public class TaRedPacketHelpController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/redPacket/help/{id}", method = RequestMethod.PUT)
-    public ResponseBean taRedPacketHelpUpdate(@PathVariable Integer id,
-                                              @RequestBody TaRedPacketHelp taRedPacketHelp) {
+    public ResponseBean taRedPacketHelpUpdate(@RequestBody TaRedPacketHelp taRedPacketHelp) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaRedPacketHelpService.updateRedPackHelp(taRedPacketHelp);

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

@@ -1,13 +1,15 @@
 package com.huiju.estateagents.redpack.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;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 红包助力人员列表 
@@ -64,5 +66,12 @@ public class TaRedPacketHistory implements Serializable {
      */
     private LocalDateTime createDate;
 
+    @TableField(exist = false)
+    private Integer helpPersonNum;
+
+    @TableField(exist = false)
+    private String nickname;
 
+    @TableField(exist = false)
+    private String avatarurl;
 }

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/mapper/TaRedPacketHistoryMapper.java

@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * <p>
  * 红包助力人员列表  Mapper 接口
@@ -21,4 +23,12 @@ public interface TaRedPacketHistoryMapper extends BaseMapper<TaRedPacketHistory>
 
     IPage<TaRedPacketHistory> listHistoryByCondition(IPage<TaRedPacketHistory> page,
                                                      @Param("activityId") String activityId);
+
+    /**
+     * 获取助力排行榜
+     * @param activityId
+     * @param orgId
+     * @return
+     */
+    List<TaRedPacketHistory> getRanking(String activityId, 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;
@@ -144,10 +145,10 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
         //下单
         Map<String, String> data = new HashMap<String, String>();
-        data.put("body", "微信支付");
+        data.put("body", "wxzf");
         //商品号唯一
         data.put("out_trade_no", taOrgOrder.getTradeNo());
-        data.put("device_info", "");
+        data.put("device_info", "WEB");
         data.put("fee_type", "CNY");
         //金额 后台计算
         data.put("total_fee", payPrice);
@@ -157,6 +158,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         data.put("notify_url", payNotify + CommConstant.ITEM_TYPE_RECHARGE);
         // 此处指定为APP支付
         data.put("trade_type", "NATIVE");
+        data.put("product_id", taOrgOrder.getOrderId());
         Map<String, String> resp = wxpay.unifiedOrder(data);
         log.info("下单成功：{}", resp);
         if (resp.get("result_code").equalsIgnoreCase(WXPayConstants.FAIL)) {
@@ -177,12 +179,17 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
+        // 计算支付金额
+        Double realAmount = amount * (1 + 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.setExpiryDate(LocalDateTime.now().plusMinutes(30));
+        taOrgOrder.setRemark("线上充值");
         taOrgOrder.setStatus(CommConstant.STATUS_NORMAL);
         taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_PROCESSING);
         taOrgOrder.setIsOffline(false);
@@ -198,8 +205,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) {
@@ -209,7 +216,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", amount * CommConstant.WXMCH_PAY_RATE);
+        obj.put("mchPayRate", CommConstant.WXMCH_PAY_RATE_STRING);
+        obj.put("payQrCode", payResult.getData());
+        obj.put("orderInfo", taOrgOrder);
+        responseBean.addSuccess(obj);
+        return responseBean;
     }
 
     @Override
@@ -229,6 +249,8 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         taOrgOrder.setTradeNo(CommonUtils.generateTradeNo(CommConstant.REFUND));
         taOrgOrder.setAmount(CommonUtils.yuanToFen(amount));
         taOrgOrder.setCreateDate(LocalDateTime.now());
+        taOrgOrder.setExpiryDate(LocalDateTime.now().plusDays(7));
+        taOrgOrder.setRemark("线上退款");
         taOrgOrder.setStatus(CommConstant.STATUS_NORMAL);
         taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_PROCESSING);
         taOrgOrder.setIsOffline(false);
@@ -272,7 +294,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
-        responseBean.addSuccess("success");
+        responseBean.addSuccess(taOrgOrder);
         return responseBean;
     }
 
@@ -306,10 +328,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 -> {
@@ -324,10 +346,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);
@@ -342,18 +364,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/java/com/huiju/estateagents/redpack/service/impl/TaRedPacketHelpServiceImpl.java

@@ -86,7 +86,7 @@ public class TaRedPacketHelpServiceImpl extends ServiceImpl<TaRedPacketHelpMappe
             taRedPacketHelp.setEndDate(taRedPacket.getEndDate());
             taRedPacketHelp.setActivityEndTip(taRedPacket.getActivityEndTip());
         }
-        responseBean.addSuccess(taRedPacket);
+        responseBean.addSuccess(taRedPacketHelp);
         return responseBean;
     }
 }

src/main/java/com/huiju/estateagents/third/controller/WxRedpackController.java

@@ -90,6 +90,37 @@ public class WxRedpackController {
         return service;
     }
 
+    /**
+     * 根据personid查询这个人需要的信息
+     * @param mpAppid
+     * @param request
+     * @return
+     */
+    @GetMapping("/third/activity/{mpAppid}/personInfo")
+    public ResponseBean getPersonInfo(@PathVariable String mpAppid, @RequestParam String personId,@RequestParam String appid, HttpServletRequest request) {
+        WxMpService wxService = getWxMpService();
+        if (!wxService.switchover(mpAppid)) {
+            throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", mpAppid));
+        }
+        Map<String,Object> map = new HashMap<>();
+        try {
+            //获取H5项目相关信息
+            QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
+
+            taThirdPartyMiniappConfigQueryWrapper.eq("appid", appid);
+            TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
+            if (null == taThirdPartyMiniappConfig){
+                return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
+            }
+            //插入公众号人员信息并插入表
+            map = iTaThirdPartyMiniappConfigService.getPersonInfo(mpAppid, taThirdPartyMiniappConfig.getTargetId(), personId);
+        } catch (Exception e) {
+//            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+        return ResponseBean.success(map);
+    }
+
     /**
      * 我要参加 活动接口
      * @param mpAppid
@@ -123,12 +154,12 @@ public class WxRedpackController {
     /**
      * 帮他助力 接口
      * @param mpAppid
-     * @param mpPersonId
+     * @param personId
      * @param request
      * @return
      */
     @PostMapping("/third/activity/{mpAppid}/help")
-    public ResponseBean helpActivity(@PathVariable String mpAppid, @RequestParam String mpPersonId, @RequestParam String sponsorPersonId,@RequestParam String appid, HttpServletRequest request) {
+    public ResponseBean helpActivity(@PathVariable String mpAppid, @RequestParam String personId, @RequestParam String sponsorPersonId,@RequestParam String appid, HttpServletRequest request) {
         WxMpService wxService = getWxMpService();
         if (!wxService.switchover(mpAppid)) {
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", mpAppid));
@@ -141,12 +172,42 @@ public class WxRedpackController {
         if (null == taThirdPartyMiniappConfig){
             return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
         }
+
+        if (personId.equals(sponsorPersonId)){
+            return ResponseBean.error("自己不能助力自己",ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         try {
-            ResponseBean res = iTaThirdPartyMiniappConfigService.helpActivity(mpAppid, mpPersonId, sponsorPersonId, taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
+            ResponseBean res = iTaThirdPartyMiniappConfigService.helpActivity(mpAppid, personId, sponsorPersonId, taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
             return res;
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error("程序出错请联系运营人员",ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
     }
+
+    /**
+     * 获取此活动的排行榜
+     * @param appid
+     * @param request
+     * @return
+     */
+    @GetMapping("/third/activity/ranking")
+    public ResponseBean getRanking(@RequestParam String appid, HttpServletRequest request) {
+        try {
+            //获取H5项目相关信息
+            QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
+
+            taThirdPartyMiniappConfigQueryWrapper.eq("appid", appid);
+            TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
+            if (null == taThirdPartyMiniappConfig){
+                return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
+            }
+            //获取活动的排行榜
+            return iTaThirdPartyMiniappConfigService.getRanking(taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
+        } catch (Exception e) {
+//            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
 }

src/main/java/com/huiju/estateagents/third/service/ITaThirdPartyMiniappConfigService.java

@@ -54,4 +54,21 @@ public interface ITaThirdPartyMiniappConfigService extends IService<TaThirdParty
 	 * @return
 	 */
 	ResponseBean helpActivity(String mpAppid, String mpPersonId, String sponsorPersonId, String targetId, Integer orgId);
+
+	/**
+	 * 获取活动排行榜
+	 * @param targetId
+	 * @param orgId
+	 * @return
+	 */
+    ResponseBean getRanking(String targetId, Integer orgId);
+
+	/**
+	 * 根据personiD获取相关信息
+	 * @param mpAppid
+	 * @param targetId
+	 * @param personId
+	 * @return
+	 */
+	Map<String, Object> getPersonInfo(String mpAppid, String targetId, String personId);
 }

src/main/java/com/huiju/estateagents/third/service/impl/TaThirdPartyMiniappConfigServiceImpl.java

@@ -189,6 +189,20 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		queryWrapper.eq("miniapp_person_id",taMpMiniapp.getMiniappPersonId());
 		TaRedPacketPerson mineRedPacketPerson = taRedPacketPersonMapper.selectOne(queryWrapper);
 		map.put("mineRedPacketPerson",mineRedPacketPerson);
+
+		//查看我的爆红助力列表
+		QueryWrapper<TaRedPacketHistory> historyQueryWrapper = new QueryWrapper<>();
+		historyQueryWrapper.eq("activity_id",taRedPacket.getActivityId());
+		historyQueryWrapper.eq("org_id",taRedPacket.getOrgId());
+		historyQueryWrapper.eq("target_mp_person",taMpMiniapp.getMpPersonId());
+		historyQueryWrapper.eq("target_miniapp_person",taMpMiniapp.getMiniappPersonId());
+		List<TaRedPacketHistory> taRedPacketHistories = taRedPacketHistoryMapper.selectList(historyQueryWrapper);
+		map.put("taRedPacketHistories",taRedPacketHistories);
+
+		//根据活动id查询这个活动的助力规则
+		TaRedPacketHelp taRedPacketHelp = taRedPacketHelpMapper.selectById(taDrainage.getActivityId());
+		map.put("taRedPacketHelp",taRedPacketHelp);
+
 		//token
 		Map<Object, Object> tokenMap = new HashMap<>();
 		tokenMap.put("openId", accessToken.getOpenId());
@@ -264,14 +278,14 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 	 * 助力活动接口
 	 *
 	 * @param mpAppid 公众号appid
-	 * @param mpPersonId 公众号personId
+	 * @param personId 小程序personId
 	 * @param sponsorPersonId 公众号发起人id
 	 * @param drainageId H5活动id
 	 * @param orgId 小程序id
 	 * @return
 	 */
 	@Override
-	public ResponseBean helpActivity(String mpAppid, String mpPersonId, String sponsorPersonId, String drainageId, Integer orgId) {
+	public ResponseBean helpActivity(String mpAppid, String personId, String sponsorPersonId, String drainageId, Integer orgId) {
 		//第一步根据drainggeid查询出红包表对应的记录
 		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
 		//第二步查询出这个H5对应的活动
@@ -285,23 +299,88 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		}
 
 		//查看这个人绑定的小程序用户
-		TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", mpPersonId));
+		TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("miniapp_person_id", personId));
 
 		//查询被助力者的绑定的小程序用户
-		TaMpMiniapp parentMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", sponsorPersonId));
+		TaMpMiniapp parentMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("miniapp_person_id", sponsorPersonId));
 
 		//根据活动id查询这个活动的助力规则
 		TaRedPacketHelp taRedPacketHelp = taRedPacketHelpMapper.selectById(taDrainage.getActivityId());
 		
 		//助力
 		String result = saveRedPacketHistory(taMpMiniapp, parentMpMiniapp, taRedPacketHelp, orgId,mpAppid);
-		if (result.equals("success")){
-			ResponseBean.error(result,ResponseBean.ERROR_ILLEGAL_PARAMS);
+		if (!result.equals("success")){
+			return ResponseBean.error(result,ResponseBean.ERROR_ILLEGAL_PARAMS);
 		}
 
 		return ResponseBean.success(taRedPacketHelp.getSuccessTip());
 	}
 
+	/**
+	 * 获取活动排行榜
+	 *
+	 * @param drainageId
+	 * @param orgId
+	 * @return
+	 */
+	@Override
+	public ResponseBean getRanking(String drainageId, Integer orgId) {
+		//第一步根据drainggeid查询出红包表对应的记录
+		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
+		//第二步查询出这个H5对应的活动
+		List<TaRedPacketHistory> taRedPacketHistoryList = taRedPacketHistoryMapper.getRanking(taDrainage.getActivityId(),orgId);
+		return ResponseBean.success(taRedPacketHistoryList);
+	}
+
+	/**
+	 * 根据personiD获取相关信息
+	 *
+	 * @param mpAppid
+	 * @param drainageId
+	 * @param personId
+	 * @return
+	 */
+	@Override
+	public Map<String, Object> getPersonInfo(String mpAppid, String drainageId, String personId) {
+		Map<String,Object> map = new HashMap<>();
+		//查看这个人是否绑定了小程序用户
+		TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("miniapp_person_id", personId));
+
+		//我的小程序信息
+		TaPerson minePerson = taPersonMapper.selectById(personId);
+		map.put("minePerson",minePerson);
+
+		//第一步根据drainggeid查询出红包表对应的记录
+		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
+		//第二步查询出这个H5对应的活动
+		TaRedPacket taRedPacket = taRedPacketMapper.selectById(taDrainage.getActivityId());
+		//活动信息
+		map.put("taRedPacket",taRedPacket);
+
+		//是否我的红包助力报名信息
+		QueryWrapper<TaRedPacketPerson> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("activity_id",taRedPacket.getActivityId());
+		queryWrapper.eq("org_id",taRedPacket.getOrgId());
+		queryWrapper.eq("mp_person_id",taMpMiniapp.getMpPersonId());
+		queryWrapper.eq("miniapp_person_id",taMpMiniapp.getMiniappPersonId());
+		TaRedPacketPerson mineRedPacketPerson = taRedPacketPersonMapper.selectOne(queryWrapper);
+		map.put("mineRedPacketPerson",mineRedPacketPerson);
+
+		//根据活动id查询这个活动的助力规则
+		TaRedPacketHelp taRedPacketHelp = taRedPacketHelpMapper.selectById(taDrainage.getActivityId());
+		map.put("taRedPacketHelp",taRedPacketHelp);
+
+		//查看我的爆红助力列表
+		QueryWrapper<TaRedPacketHistory> historyQueryWrapper = new QueryWrapper<>();
+		historyQueryWrapper.eq("activity_id",taRedPacket.getActivityId());
+		historyQueryWrapper.eq("org_id",taRedPacket.getOrgId());
+		historyQueryWrapper.eq("target_mp_person",taMpMiniapp.getMpPersonId());
+		historyQueryWrapper.eq("target_miniapp_person",taMpMiniapp.getMiniappPersonId());
+		List<TaRedPacketHistory> taRedPacketHistories = taRedPacketHistoryMapper.selectList(historyQueryWrapper);
+		map.put("taRedPacketHistories",taRedPacketHistories);
+		return map;
+	}
+
 	private synchronized String saveRedPacketHistory(TaMpMiniapp taMpMiniapp, TaMpMiniapp parentMpMiniapp, TaRedPacketHelp taRedPacketHelp, Integer orgId, String mpAppid) {
 		//查看我是否助力过
 		QueryWrapper<TaRedPacketHistory> queryWrapper = new QueryWrapper();
@@ -398,7 +477,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 				.remark(taRedPacketClient.getRemark())//备注
 				.reOpenid(parentMpPerson.getMpOpenid())//接受红包的用户openid
 
-				.sceneId("")//场景id
+				.sceneId("PRODUCT_2")//场景id
 				.sendName(taRedPacketClient.getMchName())//红包发送者名称
 				.totalAmount(redPackageMoney)//付款金额，单位分
 				.totalNum(1)//红包发放总人数

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

@@ -269,7 +269,7 @@
         SELECT
             t.*,
             t3.audit_status,
-            t3.audit_result,
+            t3.audit_result
         FROM
             ta_org_order t
         INNER JOIN ta_org_order_detail t2 ON t.order_id = t2.order_id AND t2.item_type = 'refund'
@@ -280,10 +280,16 @@
             <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>
-            <if test=" refundStartTime!= null">
+            <if test=" refundStartTime != null">
                 AND t.create_date &gt;= #{refundStartTime}
             </if>
             <if test=" refundEndTime != null">
@@ -310,6 +316,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>
@@ -397,8 +409,8 @@
             <if test = " startTime != null ">
                 AND t.create_date &gt;= #{startTime}
             </if>
-            <if test = " entartTime != null and">
-                AND t.create_date &lt;= #{entartTime}
+            <if test = " endTime != null">
+                AND t.create_date &lt;= #{endTime}
             </if>
             <if test = " status != null">
                 AND t2.status = #{status}
@@ -447,8 +459,8 @@
             <if test = " startTime != null ">
                 AND t.create_date &gt;= #{startTime}
             </if>
-            <if test = " entartTime != null and">
-                AND t.create_date &lt;= #{entartTime}
+            <if test = " endTime != null">
+                AND t.create_date &lt;= #{endTime}
             </if>
             <if test = " status != null">
                 AND t2.status = #{status}

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

@@ -3,5 +3,16 @@
 <mapper namespace="com.huiju.estateagents.redpack.mapper.TaRedPacketHistoryMapper">
 
 
-
+    <select id="getRanking" resultType="com.huiju.estateagents.redpack.entity.TaRedPacketHistory">
+        SELECT
+        t.helpPersonNum as help_person_num,
+        t.target_miniapp_person,
+        p.nickname,
+        p.avatarurl
+        FROM
+        ( SELECT count( 1 ) AS helpPersonNum, target_miniapp_person FROM ta_red_packet_history WHERE activity_id = #{activityId} AND org_id = #{orgId} GROUP BY target_miniapp_person ) t
+        LEFT JOIN ta_person p ON t.target_miniapp_person = p.person_id
+        ORDER BY
+        t.helpPersonNum DESC
+    </select>
 </mapper>