* bug 修改

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

@@ -37,6 +37,7 @@ public interface TaRedPacketMapper extends BaseMapper<TaRedPacket> {
                           @Param("startDate") LocalDateTime startDate,
                           @Param("endDate") LocalDateTime endDate,
                           @Param("templeActivityId") String templeActivityId,
+                          @Param("buildingId") String buildingId,
                           @Param("orgId") Integer orgId);
 
     /**

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

@@ -264,32 +264,13 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
-        // 3.创建账户消费流水表信息
-        TaOrgAccountDetailedList taOrgAccountDetailedList = new TaOrgAccountDetailedList();
-        taOrgAccountDetailedList.setAccountId(taOrgAccount.getAccountId());
-        taOrgAccountDetailedList.setOrgId(orgId);
-        taOrgAccountDetailedList.setAmount(amount);
-        taOrgAccountDetailedList.setSignType(1);
-        taOrgAccountDetailedList.setOrderId(taOrgOrder.getOrderId());
-        taOrgAccountDetailedList.setRemark("线上充值");
-        taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
-        taOrgAccountDetailedList.setUserId(userId);
-        taOrgAccountDetailedList.setUserName(taUser.getUserName());
-        taOrgAccountDetailedList.setCreateDate(LocalDateTime.now());
-        if (taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList) < 1) {
-            taOrgOrderMapper.deleteById(taOrgOrder.getOrderId());
-            taOrgOrderDetailMapper.deleteById(taOrgOrderDetail.getSerialNo());
-            responseBean.addError("fail");
-            return responseBean;
-        }
-
-        // 4.请求微信接口获取支付二维码
+        // 3.请求微信接口获取支付二维码
         ResponseBean payResult = payUnifiedOrder(taOrgOrder, ip);
         if (ResponseBean.CODE_SUCCESS != payResult.getCode()) {
             return payResult;
         }
 
-        // 5.发送短信
+        // 4.发送短信
         ExecutorService threadPool = Executors.newCachedThreadPool();
         threadPool.execute(() -> {
             List<TaContact> taContacts = taOrgAccountService.selectSmsContactUser();
@@ -403,30 +384,10 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
             return responseBean;
         }
 
-        // 6.创建账户消费流水表信息
-        TaOrgAccountDetailedList taOrgAccountDetailedList = new TaOrgAccountDetailedList();
-        taOrgAccountDetailedList.setAccountId(taOrgAccount.getAccountId());
-        taOrgAccountDetailedList.setOrgId(orgId);
-        taOrgAccountDetailedList.setAmount(amount);
-        taOrgAccountDetailedList.setSignType(-1);
-        taOrgAccountDetailedList.setOrderId(taOrgOrder.getOrderId());
-        taOrgAccountDetailedList.setRemark("线上申请退款");
-        taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
-        taOrgAccountDetailedList.setUserId(userId);
-        taOrgAccountDetailedList.setUserName(taUser.getUserName());
-        taOrgAccountDetailedList.setCreateDate(LocalDateTime.now());
-        if (taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList) < 1) {
-            taOrgOrderMapper.deleteById(taOrgOrder.getOrderId());
-            taOrgOrderDetailMapper.deleteById(taOrgOrderDetail.getSerialNo());
-            taOrgAccountBlockedMapper.deleteById(taOrgAccountBlocked.getSerialNo());
-            responseBean.addError("fail");
-            return responseBean;
-        }
-
-        // 7.更新账户新金额
+        // 6.更新账户新金额
         taOrgAccountMapper.updateAvailableBalanceById(taOrgAccount.getAccountId(), amount);
 
-        // 8.发送短信
+        // 7.发送短信
         ExecutorService threadPool = Executors.newCachedThreadPool();
         threadPool.execute(() -> {
             List<TaContact> taContacts = taOrgAccountService.selectSmsContactUser();

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

@@ -66,7 +66,7 @@ public class TaRedPacketServiceImpl extends ServiceImpl<TaRedPacketMapper, TaRed
         TaMiniapp taMiniapp = taMiniappMapper.selectOne(miniappQueryWrapper);
 
         // 初始化数据
-        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(), record.getTempleActivityId(), record.getOrgId());
+        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(), record.getTempleActivityId(),record.getBuildingId(), record.getOrgId());
         taRedPacketMapper.initRedPacketHelp(record.getActivityId(), record.getTempleActivityId());
         taRedPacketMapper.initRedPacketClient(record.getActivityId(), record.getName(), taMiniapp.getName(),record.getTempleActivityId());
         taRedPacketMapper.initRedPacketMoney(record.getActivityId(), record.getTempleActivityId());

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

@@ -568,9 +568,9 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
                 .wxAppid(mpAppid)//公众账号appid
                 .build();
         try {
-            logger.info("发送微信红包请求参数：{}", JSONObject.toJSONString(build));
+            logger.info("发起助力 发送微信红包请求参数：{}", JSONObject.toJSONString(build));
             WxPaySendRedpackResult wxPaySendRedpackResult = wxPayService.sendRedpack(build);
-            logger.info("发送微信红包返回结果：{}", JSONObject.toJSONString(wxPaySendRedpackResult));
+            logger.info("发起助力 发送微信红包返回结果：{}", JSONObject.toJSONString(wxPaySendRedpackResult));
             String resultCode = wxPaySendRedpackResult.getResultCode();
             if (resultCode.equals("SUCCESS")) {
                 taRedPacketMoney.setPacketSendedNum(taRedPacketMoney.getPacketSendedNum() + 1);

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

@@ -16,7 +16,8 @@
         `building_name`,
         `poster_show_pos`,
         `join_fields`,
-        `org_id`
+        `org_id`,
+        `building_id`
         ) SELECT
         #{activityId},
         #{name},
@@ -30,7 +31,8 @@
         `building_name`,
         `poster_show_pos`,
         `join_fields`,
-        #{orgId}
+        #{orgId},
+        #{buildingId}
         FROM
             ta_red_packet t2
         WHERE