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

src/main/java/com/huiju/estateagents/entity/TaCustomerFrom.java

@@ -148,4 +148,34 @@ public class TaCustomerFrom implements Serializable {
      * 推广码ID
      */
     private Integer qrCodeId;
+
+    /**
+     * 用户头像
+     */
+    @TableField(exist = false)
+    private String avatarurl;
+
+    /**
+     * 分享人昵称
+     */
+    @TableField(exist = false)
+    private String sharePersonNickname;
+
+    /**
+     * 分享人手机号
+     */
+    @TableField(exist = false)
+    private String sharePersonPhone;
+
+    /**
+     * 用户昵称
+     */
+    @TableField(exist = false)
+    private String nickname;
+
+    /**
+     * 用户名
+     */
+    @TableField(exist = false)
+    private String name;
 }

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

@@ -1,42 +1,17 @@
 package com.huiju.estateagents.redpack.controller;
 
-import java.io.IOException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 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;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.bo.request.SaveCzOrderRequestBO;
+import com.huiju.estateagents.bo.request.SaveRefundOrderRequestBO;
 import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.excel.ActivityStatistics.VisitPersonNum;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.redpack.entity.ConsumeOrder;
 import com.huiju.estateagents.redpack.entity.RechargeOrder;
@@ -44,6 +19,19 @@ import com.huiju.estateagents.redpack.entity.RefundOrder;
 import com.huiju.estateagents.redpack.entity.TaOrgOrder;
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
 import com.huiju.estateagents.service.ITaPersonService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>

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

@@ -3,6 +3,9 @@ package com.huiju.estateagents.redpack.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.redpack.entity.TaOrgAccount;
+import com.huiju.estateagents.sample.entity.TaContact;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,6 +18,7 @@ import com.huiju.estateagents.redpack.entity.TaOrgAccount;
 public interface ITaOrgAccountService extends IService<TaOrgAccount> {
     /**
      * 账户充值接口
+     *
      * @param accountId
      * @param taOrgAccount
      * @param orgId
@@ -24,6 +28,7 @@ public interface ITaOrgAccountService extends IService<TaOrgAccount> {
 
     /**
      * 账户退费接口
+     *
      * @param accountId
      * @param taOrgAccount
      * @param orgId
@@ -34,6 +39,7 @@ public interface ITaOrgAccountService extends IService<TaOrgAccount> {
 
     /**
      * 账户详情接口
+     *
      * @param orgId
      * @return
      */
@@ -46,4 +52,8 @@ public interface ITaOrgAccountService extends IService<TaOrgAccount> {
      * @return
      */
     ResponseBean getOrgAccountInfoByOrgId(Integer orgId);
+
+    String sendSmsMessage(String tel, String type, String[] params);
+
+    List<TaContact> selectSmsContactUser();
 }

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

@@ -395,7 +395,8 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         return taUser;
     }
 
-    private String sendSmsMessage(String tel, String type, String[] params) {
+    @Override
+    public String sendSmsMessage(String tel, String type, String[] params) {
         if (StringUtils.isEmpty(tel) || StringUtils.isEmpty(type)) {
             return "短信发送失败: 没有手机号或者短信模板";
         }
@@ -420,6 +421,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         return success ? null : "短信发送失败";
     }
 
+    @Override
     public List<TaContact> selectSmsContactUser(){
         QueryWrapper<TaContact> taContactQueryWrapper = new QueryWrapper<>();
         taContactQueryWrapper.eq("contact_Type", CommConstant.FINANCE);

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

@@ -1,31 +1,8 @@
 package com.huiju.estateagents.redpack.service.impl;
 
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -36,7 +13,6 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.CommonUtils;
-import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.common.wxpay.WXPay;
 import com.huiju.estateagents.common.wxpay.WXPayConstants;
 import com.huiju.estateagents.common.wxpay.WxConfig;
@@ -45,26 +21,34 @@ 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.TaWxPayConfigMapper;
-import com.huiju.estateagents.redpack.entity.ConsumeOrder;
-import com.huiju.estateagents.redpack.entity.RechargeOrder;
-import com.huiju.estateagents.redpack.entity.RefundOrder;
-import com.huiju.estateagents.redpack.entity.TaOrgAccount;
-import com.huiju.estateagents.redpack.entity.TaOrgAccountBlocked;
-import com.huiju.estateagents.redpack.entity.TaOrgAccountCertificate;
-import com.huiju.estateagents.redpack.entity.TaOrgAccountDetailedList;
-import com.huiju.estateagents.redpack.entity.TaOrgOrder;
-import com.huiju.estateagents.redpack.entity.TaOrgOrderDetail;
-import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
-import com.huiju.estateagents.redpack.mapper.TaOrgAccountBlockedMapper;
-import com.huiju.estateagents.redpack.mapper.TaOrgAccountCertificateMapper;
-import com.huiju.estateagents.redpack.mapper.TaOrgAccountDetailedListMapper;
-import com.huiju.estateagents.redpack.mapper.TaOrgAccountMapper;
-import com.huiju.estateagents.redpack.mapper.TaOrgOrderDetailMapper;
-import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
-import com.huiju.estateagents.redpack.mapper.TaOrgRefundApplicationMapper;
+import com.huiju.estateagents.redpack.entity.*;
+import com.huiju.estateagents.redpack.mapper.*;
+import com.huiju.estateagents.redpack.service.ITaOrgAccountService;
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
-
+import com.huiju.estateagents.sample.entity.TaContact;
+import com.huiju.estateagents.sample.mapper.TaContactMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -111,6 +95,12 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     @Autowired
     private TaWxPayConfigMapper taWxPayConfigMapper;
 
+    @Autowired
+    private TaContactMapper taContactMapper;
+
+    @Autowired
+    private ITaOrgAccountService taOrgAccountService;
+
     @Override
     public IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, String startDate, String endDate, String miniAppName, String auditStatus) {
         IPage<TaOrgOrder> result = pg;
@@ -148,7 +138,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         return result;
     }
 
-    public List<String> getCertificateByOrderId(String orderId){
+    public List<String> getCertificateByOrderId(String orderId) {
         List<String> urlList = new ArrayList<>();
         QueryWrapper<TaOrgAccountCertificate> taOrgAccountCertificateQueryWrapper = new QueryWrapper<>();
         taOrgAccountCertificateQueryWrapper.eq("order_id", orderId);
@@ -156,6 +146,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         urlList = taOrgAccountCertificates.stream().map(TaOrgAccountCertificate::getUrl).collect(Collectors.toList());
         return urlList;
     }
+
     /**
      * 微信支付
      *
@@ -257,6 +248,18 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return payResult;
         }
 
+        // 4.发送短信
+        ExecutorService threadPool = Executors.newCachedThreadPool();
+        threadPool.execute(() -> {
+            List<TaContact> taContacts = taOrgAccountService.selectSmsContactUser();
+            if (CollectionUtils.isNotEmpty(taContacts)) {
+                TaContact taContact = taContacts.get(0);
+                String[] smsParams = {"业务平台充值提醒", taOrgOrder.getTradeNo()};
+                // 短信发送
+                taOrgAccountService.sendSmsMessage(taContact.getPhone(), CommConstant.ITEM_TYPE_RECHARGE, smsParams);
+            }
+        });
+
         JSONObject obj = new JSONObject();
         obj.put("amount", amount);
         obj.put("realAmount", realAmount);
@@ -348,8 +351,30 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
-        // 5.更新账户新金额
+        // 5.创建冻结表数据
+        TaOrgAccountBlocked taOrgAccountBlocked = new TaOrgAccountBlocked();
+        taOrgAccountBlocked.setAccountId(taOrgAccount.getAccountId());
+        taOrgAccountBlocked.setBlockedBalance(amount);
+        taOrgAccountBlocked.setBlockedReason("线上退款申请");
+        taOrgAccountBlocked.setCreateDate(LocalDateTime.now());
+        taOrgAccountBlocked.setStatus(CommConstant.STATUS_NORMAL);
+        taOrgAccountBlocked.setOrgId(orgId);
+        taOrgAccountBlockedMapper.insert(taOrgAccountBlocked);
+
+        // 6.更新账户新金额
         taOrgAccountMapper.updateAvailableBalanceById(taOrgAccount.getAccountId(), amount);
+
+        // 7.发送短信
+        ExecutorService threadPool = Executors.newCachedThreadPool();
+        threadPool.execute(() -> {
+            List<TaContact> taContacts = taOrgAccountService.selectSmsContactUser();
+            if (CollectionUtils.isNotEmpty(taContacts)) {
+                TaContact taContact = taContacts.get(0);
+                String[] smsParams = {"业务平台退款申请", taOrgOrder.getTradeNo()};
+                // 短信发送
+                taOrgAccountService.sendSmsMessage(taContact.getPhone(), CommConstant.ITEM_TYPE_RECHARGE, smsParams);
+            }
+        });
         responseBean.addSuccess(taOrgOrder);
         return responseBean;
     }

src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java

@@ -190,6 +190,7 @@ public class WxPayServiceImpl implements IWxPayService {
         taOrgAccountDetailedList.setOrgId(taOrgOrder.getOrgId());
         taOrgAccountDetailedList.setSignType(1);
         taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
+        taOrgAccountDetailedList.setRemark("线上充值");
         taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
         //添加账户金额
         taOrgAccount.setAvailableBalance(taOrgAccount.getAvailableBalance() + taOrgOrder.getAmount());

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

@@ -562,8 +562,8 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
         try {
             logger.info("发送微信红包请求参数：{}", JSONObject.toJSONString(build));
             WxPaySendRedpackResult wxPaySendRedpackResult = wxPayService.sendRedpack(build);
+            logger.info("发送微信红包返回结果：{}", JSONObject.toJSONString(wxPaySendRedpackResult));
             String resultCode = wxPaySendRedpackResult.getResultCode();
-            logger.info("发送微信红包返回结果：{}", resultCode);
             if (resultCode.equals("SUCCESS")) {
                 taRedPacketMoney.setPacketSendedNum(taRedPacketMoney.getPacketSendedNum() + 1);
                 taRedPacketmonetMapper.updateById(taRedPacketMoney);

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

@@ -374,9 +374,10 @@
     <select id = "listConsumeOrderByCondition" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
         SELECT
             t.*,
-            t3.phone
+            t3.phone,
+            t2.consume_type,
             <if test="consumeType == 'RedPacket'">
-                ,t4.name
+                ,t4.name activityName
             </if>
         FROM
             ta_org_order t
@@ -428,7 +429,7 @@
             t.amount,
             ( CASE t2.item_type WHEN 'RedPacket' THEN '红包' ELSE '' END ) consumeType,
             <if test="consumeType == 'RedPacket'">
-                t4.name,
+                t4.name activityName,
             </if>
             t.create_date,
             t3.phone,