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

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

@@ -12,6 +12,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
  * 红包助力设置  前端控制器
@@ -129,10 +131,10 @@ public class TaRedPacketHelpController extends BaseController {
      * @param id 实体ID
      */
     @RequestMapping(value = "/admin/redPacket/help/{id}", method = RequestMethod.GET)
-    public ResponseBean taRedPacketHelpGet(@PathVariable String id) {
+    public ResponseBean taRedPacketHelpGet(@PathVariable String id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaRedPacketHelpService.getRedPacketHelpById(id);
+            responseBean = iTaRedPacketHelpService.getRedPacketHelpById(id,getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taRedPacketHelpDelete -=- {}", e.toString());

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

@@ -12,6 +12,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
  * 红包金额设置  前端控制器
@@ -130,10 +132,10 @@ public class TaRedPacketMoneyController extends BaseController {
      * @param id 实体ID
      */
     @RequestMapping(value = "/admin/redPacket/money/{id}", method = RequestMethod.GET)
-    public ResponseBean taRedPacketMoneyGet(@PathVariable String id) {
+    public ResponseBean taRedPacketMoneyGet(@PathVariable String id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaRedPacketMoneyService.getRedPacketMoneyById(id);
+            responseBean = iTaRedPacketMoneyService.getRedPacketMoneyById(id, getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taRedPacketMoneyDelete -=- {}", e.toString());

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.redpack.entity;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -48,6 +49,4 @@ public class TaRedPacketClient implements Serializable {
      * 备注
      */
     private String remark;
-
-
 }

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

@@ -88,4 +88,22 @@ public class TaRedPacketMoney implements Serializable {
      */
     @TableField(exist = false)
     private String remark;
+
+    /**
+     * 已发送红包数量
+     */
+    @TableField(exist = false)
+    private Long sendNum;
+
+    /**
+     * 已发送红包金额
+     */
+    @TableField(exist = false)
+    private Long sendTotalAmount;
+
+    /**
+     * 账户余额
+     */
+    @TableField(exist = false)
+    private Integer availableBalance;
 }

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

@@ -17,4 +17,6 @@ import com.huiju.estateagents.redpack.entity.TaOrgAccount;
 @Mapper
 public interface TaOrgAccountMapper extends BaseMapper<TaOrgAccount> {
     TaOrgAccount getOrgAccountById(@Param("orgId") Integer orgId);
+
+    Integer updateAvailableBalanceById(@Param("accountId") String accountId, @Param("amount") Integer amount);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.redpack.mapper;
 
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 
 import com.huiju.estateagents.excel.redPacket.AccountConsumeRecordExport;
 import com.huiju.estateagents.excel.redPacket.AccountPayRecordExport;
@@ -95,10 +96,10 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      * @return
      */
     List<RefundOrder> orderListByRefundExport(@Param("itemType") String itemType,
-                                               @Param("tradeNo") String tradeNo,
-                                               @Param("startDate") String startDate,
-                                               @Param("endDate") String endDate,
-                                               @Param("miniAppName") String miniAppName);
+                                              @Param("tradeNo") String tradeNo,
+                                              @Param("startDate") String startDate,
+                                              @Param("endDate") String endDate,
+                                              @Param("miniAppName") String miniAppName);
 
     /**
      * 获取充值订单列表
@@ -258,4 +259,17 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                                                    @Param("wxOrderId") String wxOrderId,
                                                                    @Param("tradeNo") String tradeNo,
                                                                    @Param("orgId") Integer orgId);
+
+
+    /**
+     * 获取红包发送数据
+     *
+     * @param targetType
+     * @param targetId
+     * @param orgId
+     * @return
+     */
+    Map<String, Object> getRedPacketSendInfo(@Param("targetType") String targetType,
+                                              @Param("targetId") String targetId,
+                                              @Param("orgId") Integer orgId);
 }

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

@@ -27,6 +27,6 @@ public interface ITaRedPacketHelpService extends IService<TaRedPacketHelp> {
      * @param activityId
      * @return
      */
-    ResponseBean getRedPacketHelpById(String activityId);
+    ResponseBean getRedPacketHelpById(String activityId,Integer orgId);
 
 }

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

@@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaRedPacketMoneyService extends IService<TaRedPacketMoney> {
 
-    ResponseBean getRedPacketMoneyById(String activityId);
+    ResponseBean getRedPacketMoneyById(String activityId,Integer orgId);
 
     ResponseBean updateRedPacketMoney(TaRedPacketMoney taRedPacketMoney);
 

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

@@ -24,6 +24,7 @@ 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;
@@ -116,7 +117,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
             result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName);
             result.getRecords().forEach(e -> {
-                if (!StringUtils.isEmpty(e.getCertificateUrl())){
+                if (!StringUtils.isEmpty(e.getCertificateUrl())) {
                     e.setCertificateUrlList(Arrays.asList(e.getCertificateUrl().split(",")));
                 }
             });
@@ -270,16 +271,16 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
         // 查询账户信息
         QueryWrapper<TaOrgAccount> orgAccountQueryWrapper = new QueryWrapper<>();
-        orgAccountQueryWrapper.eq("org_id",orgId);
-        orgAccountQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        orgAccountQueryWrapper.eq("org_id", orgId);
+        orgAccountQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
         TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(orgAccountQueryWrapper);
-        if(taOrgAccount == null){
+        if (taOrgAccount == null) {
             responseBean.addError("账户不存在");
             return responseBean;
         }
 
         // 1.校验账户金额
-        if(amount > CommonUtils.fenToYuan(taOrgAccount.getAvailableBalance())){
+        if (amount > CommonUtils.fenToYuan(taOrgAccount.getAvailableBalance())) {
             responseBean.addError("账户可用余额不足，请稍后再试");
             return responseBean;
         }
@@ -335,6 +336,8 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
+        // 5.更新账户新金额
+        taOrgAccountMapper.updateAvailableBalanceById(taOrgAccount.getAccountId(), CommonUtils.yuanToFen(amount));
         responseBean.addSuccess(taOrgOrder);
         return responseBean;
     }
@@ -350,7 +353,14 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
                 QueryWrapper<TaOrgAccountCertificate> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("order_id", r.getOrderId());
                 queryWrapper.eq("org_id", orgId);
-                r.setCertificateList(taOrgAccountCertificateMapper.selectList(queryWrapper));
+                List<TaOrgAccountCertificate> accountCertificates = taOrgAccountCertificateMapper.selectList(queryWrapper);
+                if (CollectionUtils.isNotEmpty(accountCertificates)) {
+                    List<String> certificateUrlList = new ArrayList<>();
+                    accountCertificates.stream().forEach(e -> {
+                        certificateUrlList.add(e.getUrl());
+                    });
+                    r.setCertificateUrlList(certificateUrlList);
+                }
             });
         }
         responseBean.addSuccess(pg);
@@ -379,7 +389,14 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
                 QueryWrapper<TaOrgAccountCertificate> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("order_id", r.getOrderId());
                 queryWrapper.eq("org_id", orgId);
-                r.setCertificateList(taOrgAccountCertificateMapper.selectList(queryWrapper));
+                List<TaOrgAccountCertificate> accountCertificates = taOrgAccountCertificateMapper.selectList(queryWrapper);
+                if (CollectionUtils.isNotEmpty(accountCertificates)) {
+                    List<String> certificateUrlList = new ArrayList<>();
+                    accountCertificates.stream().forEach(e -> {
+                        certificateUrlList.add(e.getUrl());
+                    });
+                    r.setCertificateUrlList(certificateUrlList);
+                }
             });
         }
         responseBean.addSuccess(pg);

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

@@ -3,9 +3,11 @@ package com.huiju.estateagents.redpack.service.impl;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.redpack.entity.TaRedPacket;
 import com.huiju.estateagents.redpack.entity.TaRedPacketHelp;
+import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
 import com.huiju.estateagents.redpack.mapper.TaRedPacketHelpMapper;
 import com.huiju.estateagents.redpack.service.ITaRedPacketHelpService;
 import com.huiju.estateagents.redpack.service.ITaRedPacketService;
@@ -16,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
+import java.util.Map;
 
 /**
  * <p>
@@ -36,6 +39,9 @@ public class TaRedPacketHelpServiceImpl extends ServiceImpl<TaRedPacketHelpMappe
     @Autowired
     private ITaRedPacketService iTaRedPacketService;
 
+    @Autowired
+    private TaOrgOrderMapper taOrgOrderMapper;
+
     @Override
     public ResponseBean updateRedPackHelp(TaRedPacketHelp taRedPacketHelp) {
         ResponseBean responseBean = new ResponseBean();
@@ -75,7 +81,7 @@ public class TaRedPacketHelpServiceImpl extends ServiceImpl<TaRedPacketHelpMappe
     }
 
     @Override
-    public ResponseBean getRedPacketHelpById(String activityId) {
+    public ResponseBean getRedPacketHelpById(String activityId,Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         TaRedPacketHelp taRedPacketHelp = getById(activityId);
 
@@ -86,6 +92,7 @@ public class TaRedPacketHelpServiceImpl extends ServiceImpl<TaRedPacketHelpMappe
             taRedPacketHelp.setEndDate(taRedPacket.getEndDate());
             taRedPacketHelp.setActivityEndTip(taRedPacket.getActivityEndTip());
         }
+
         responseBean.addSuccess(taRedPacketHelp);
         return responseBean;
     }

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

@@ -1,9 +1,14 @@
 package com.huiju.estateagents.redpack.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.redpack.entity.TaOrgAccount;
 import com.huiju.estateagents.redpack.entity.TaRedPacketClient;
 import com.huiju.estateagents.redpack.entity.TaRedPacketMoney;
+import com.huiju.estateagents.redpack.mapper.TaOrgAccountMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
 import com.huiju.estateagents.redpack.mapper.TaRedPacketMoneyMapper;
 import com.huiju.estateagents.redpack.service.ITaRedPacketClientService;
 import com.huiju.estateagents.redpack.service.ITaRedPacketMoneyService;
@@ -11,6 +16,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * <p>
  * 红包金额设置  服务实现类
@@ -25,8 +32,14 @@ public class TaRedPacketMoneyServiceImpl extends ServiceImpl<TaRedPacketMoneyMap
     @Autowired
     private ITaRedPacketClientService iTaRedPacketClientService;
 
+    @Autowired
+    private TaOrgOrderMapper taOrgOrderMapper;
+
+    @Autowired
+    private TaOrgAccountMapper taOrgAccountMapper;
+
     @Override
-    public ResponseBean getRedPacketMoneyById(String activityId) {
+    public ResponseBean getRedPacketMoneyById(String activityId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
 
         // 获取红包金额设置
@@ -44,6 +57,18 @@ public class TaRedPacketMoneyServiceImpl extends ServiceImpl<TaRedPacketMoneyMap
             taRedPacketMoney.setBlessing(taRedPacketClient.getBlessing());
             taRedPacketMoney.setRemark(taRedPacketClient.getRemark());
         }
+        Map<String, Object> result = taOrgOrderMapper.getRedPacketSendInfo(CommConstant.RED_PACKET, activityId, orgId);
+        taRedPacketMoney.setSendNum((Long) result.get("sendNum"));
+        taRedPacketMoney.setSendTotalAmount((Long) result.get("sendTotalAmount"));
+
+        QueryWrapper<TaOrgAccount> orgAccountQueryWrapper =new QueryWrapper<>();
+        orgAccountQueryWrapper.eq("org_id",orgId);
+        orgAccountQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(orgAccountQueryWrapper);
+        if(taOrgAccount != null){
+            taRedPacketMoney.setAvailableBalance(taOrgAccount.getAvailableBalance());
+        }
+
         responseBean.addSuccess(taRedPacketMoney);
         return responseBean;
     }
@@ -56,7 +81,7 @@ public class TaRedPacketMoneyServiceImpl extends ServiceImpl<TaRedPacketMoneyMap
         updateById(taRedPacketMoney);
         // 更新红包客户端消息配置
         if (!StringUtils.isEmpty(taRedPacketMoney.getActivityName()) || !StringUtils.isEmpty(taRedPacketMoney.getMchName())
-                || !StringUtils.isEmpty(taRedPacketMoney.getBlessing()) || !StringUtils.isEmpty(taRedPacketMoney.getRemark())){
+                || !StringUtils.isEmpty(taRedPacketMoney.getBlessing()) || !StringUtils.isEmpty(taRedPacketMoney.getRemark())) {
             TaRedPacketClient taRedPacketClient = new TaRedPacketClient();
             taRedPacketClient.setActivityId(taRedPacketMoney.getActivityId());
             taRedPacketClient.setMchName(taRedPacketMoney.getMchName());

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

@@ -16,4 +16,8 @@
         where t.org_id = #{orgId}
     </select>
 
+    <update id="updateAvailableBalanceById">
+        update ta_org_account t set t.available_balance = t.available_balance - #{amount} where t.account_id = #{accountId}
+    </update>
+
 </mapper>

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

@@ -493,4 +493,17 @@
         </if>
         GROUP BY t.order_id
     </select>
+
+    <select id = "getRedPacketSendInfo" resultType="map">
+
+        SELECT
+        count( * ) sendNum,
+        sum(t3.amount) sendTotalAmount
+    FROM
+        ta_org_order_detail t3
+    WHERE
+        t3.target_type = #{targetType}
+        AND t3.target_id = #{targetId}
+        and t3.org_id = #{orgId}
+    </select>
 </mapper>