Browse Source

* bug 修改

顾绍勇 4 years ago
parent
commit
f8b1973bf7

+ 1
- 0
src/main/java/com/huiju/estateagents/redpack/mapper/TaRedPacketMapper.java View File

37
                           @Param("startDate") LocalDateTime startDate,
37
                           @Param("startDate") LocalDateTime startDate,
38
                           @Param("endDate") LocalDateTime endDate,
38
                           @Param("endDate") LocalDateTime endDate,
39
                           @Param("templeActivityId") String templeActivityId,
39
                           @Param("templeActivityId") String templeActivityId,
40
+                          @Param("buildingId") String buildingId,
40
                           @Param("orgId") Integer orgId);
41
                           @Param("orgId") Integer orgId);
41
 
42
 
42
     /**
43
     /**

+ 4
- 43
src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java View File

264
             return responseBean;
264
             return responseBean;
265
         }
265
         }
266
 
266
 
267
-        // 3.创建账户消费流水表信息
268
-        TaOrgAccountDetailedList taOrgAccountDetailedList = new TaOrgAccountDetailedList();
269
-        taOrgAccountDetailedList.setAccountId(taOrgAccount.getAccountId());
270
-        taOrgAccountDetailedList.setOrgId(orgId);
271
-        taOrgAccountDetailedList.setAmount(amount);
272
-        taOrgAccountDetailedList.setSignType(1);
273
-        taOrgAccountDetailedList.setOrderId(taOrgOrder.getOrderId());
274
-        taOrgAccountDetailedList.setRemark("线上充值");
275
-        taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
276
-        taOrgAccountDetailedList.setUserId(userId);
277
-        taOrgAccountDetailedList.setUserName(taUser.getUserName());
278
-        taOrgAccountDetailedList.setCreateDate(LocalDateTime.now());
279
-        if (taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList) < 1) {
280
-            taOrgOrderMapper.deleteById(taOrgOrder.getOrderId());
281
-            taOrgOrderDetailMapper.deleteById(taOrgOrderDetail.getSerialNo());
282
-            responseBean.addError("fail");
283
-            return responseBean;
284
-        }
285
-
286
-        // 4.请求微信接口获取支付二维码
267
+        // 3.请求微信接口获取支付二维码
287
         ResponseBean payResult = payUnifiedOrder(taOrgOrder, ip);
268
         ResponseBean payResult = payUnifiedOrder(taOrgOrder, ip);
288
         if (ResponseBean.CODE_SUCCESS != payResult.getCode()) {
269
         if (ResponseBean.CODE_SUCCESS != payResult.getCode()) {
289
             return payResult;
270
             return payResult;
290
         }
271
         }
291
 
272
 
292
-        // 5.发送短信
273
+        // 4.发送短信
293
         ExecutorService threadPool = Executors.newCachedThreadPool();
274
         ExecutorService threadPool = Executors.newCachedThreadPool();
294
         threadPool.execute(() -> {
275
         threadPool.execute(() -> {
295
             List<TaContact> taContacts = taOrgAccountService.selectSmsContactUser();
276
             List<TaContact> taContacts = taOrgAccountService.selectSmsContactUser();
403
             return responseBean;
384
             return responseBean;
404
         }
385
         }
405
 
386
 
406
-        // 6.创建账户消费流水表信息
407
-        TaOrgAccountDetailedList taOrgAccountDetailedList = new TaOrgAccountDetailedList();
408
-        taOrgAccountDetailedList.setAccountId(taOrgAccount.getAccountId());
409
-        taOrgAccountDetailedList.setOrgId(orgId);
410
-        taOrgAccountDetailedList.setAmount(amount);
411
-        taOrgAccountDetailedList.setSignType(-1);
412
-        taOrgAccountDetailedList.setOrderId(taOrgOrder.getOrderId());
413
-        taOrgAccountDetailedList.setRemark("线上申请退款");
414
-        taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
415
-        taOrgAccountDetailedList.setUserId(userId);
416
-        taOrgAccountDetailedList.setUserName(taUser.getUserName());
417
-        taOrgAccountDetailedList.setCreateDate(LocalDateTime.now());
418
-        if (taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList) < 1) {
419
-            taOrgOrderMapper.deleteById(taOrgOrder.getOrderId());
420
-            taOrgOrderDetailMapper.deleteById(taOrgOrderDetail.getSerialNo());
421
-            taOrgAccountBlockedMapper.deleteById(taOrgAccountBlocked.getSerialNo());
422
-            responseBean.addError("fail");
423
-            return responseBean;
424
-        }
425
-
426
-        // 7.更新账户新金额
387
+        // 6.更新账户新金额
427
         taOrgAccountMapper.updateAvailableBalanceById(taOrgAccount.getAccountId(), amount);
388
         taOrgAccountMapper.updateAvailableBalanceById(taOrgAccount.getAccountId(), amount);
428
 
389
 
429
-        // 8.发送短信
390
+        // 7.发送短信
430
         ExecutorService threadPool = Executors.newCachedThreadPool();
391
         ExecutorService threadPool = Executors.newCachedThreadPool();
431
         threadPool.execute(() -> {
392
         threadPool.execute(() -> {
432
             List<TaContact> taContacts = taOrgAccountService.selectSmsContactUser();
393
             List<TaContact> taContacts = taOrgAccountService.selectSmsContactUser();

+ 1
- 1
src/main/java/com/huiju/estateagents/redpack/service/impl/TaRedPacketServiceImpl.java View File

66
         TaMiniapp taMiniapp = taMiniappMapper.selectOne(miniappQueryWrapper);
66
         TaMiniapp taMiniapp = taMiniappMapper.selectOne(miniappQueryWrapper);
67
 
67
 
68
         // 初始化数据
68
         // 初始化数据
69
-        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(), record.getTempleActivityId(), record.getOrgId());
69
+        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(), record.getTempleActivityId(),record.getBuildingId(), record.getOrgId());
70
         taRedPacketMapper.initRedPacketHelp(record.getActivityId(), record.getTempleActivityId());
70
         taRedPacketMapper.initRedPacketHelp(record.getActivityId(), record.getTempleActivityId());
71
         taRedPacketMapper.initRedPacketClient(record.getActivityId(), record.getName(), taMiniapp.getName(),record.getTempleActivityId());
71
         taRedPacketMapper.initRedPacketClient(record.getActivityId(), record.getName(), taMiniapp.getName(),record.getTempleActivityId());
72
         taRedPacketMapper.initRedPacketMoney(record.getActivityId(), record.getTempleActivityId());
72
         taRedPacketMapper.initRedPacketMoney(record.getActivityId(), record.getTempleActivityId());

+ 2
- 2
src/main/java/com/huiju/estateagents/third/service/impl/TaThirdPartyMiniappConfigServiceImpl.java View File

568
                 .wxAppid(mpAppid)//公众账号appid
568
                 .wxAppid(mpAppid)//公众账号appid
569
                 .build();
569
                 .build();
570
         try {
570
         try {
571
-            logger.info("发送微信红包请求参数:{}", JSONObject.toJSONString(build));
571
+            logger.info("发起助力 发送微信红包请求参数:{}", JSONObject.toJSONString(build));
572
             WxPaySendRedpackResult wxPaySendRedpackResult = wxPayService.sendRedpack(build);
572
             WxPaySendRedpackResult wxPaySendRedpackResult = wxPayService.sendRedpack(build);
573
-            logger.info("发送微信红包返回结果:{}", JSONObject.toJSONString(wxPaySendRedpackResult));
573
+            logger.info("发起助力 发送微信红包返回结果:{}", JSONObject.toJSONString(wxPaySendRedpackResult));
574
             String resultCode = wxPaySendRedpackResult.getResultCode();
574
             String resultCode = wxPaySendRedpackResult.getResultCode();
575
             if (resultCode.equals("SUCCESS")) {
575
             if (resultCode.equals("SUCCESS")) {
576
                 taRedPacketMoney.setPacketSendedNum(taRedPacketMoney.getPacketSendedNum() + 1);
576
                 taRedPacketMoney.setPacketSendedNum(taRedPacketMoney.getPacketSendedNum() + 1);

+ 4
- 2
src/main/resources/mapper/redpack/TaRedPacketMapper.xml View File

16
         `building_name`,
16
         `building_name`,
17
         `poster_show_pos`,
17
         `poster_show_pos`,
18
         `join_fields`,
18
         `join_fields`,
19
-        `org_id`
19
+        `org_id`,
20
+        `building_id`
20
         ) SELECT
21
         ) SELECT
21
         #{activityId},
22
         #{activityId},
22
         #{name},
23
         #{name},
30
         `building_name`,
31
         `building_name`,
31
         `poster_show_pos`,
32
         `poster_show_pos`,
32
         `join_fields`,
33
         `join_fields`,
33
-        #{orgId}
34
+        #{orgId},
35
+        #{buildingId}
34
         FROM
36
         FROM
35
             ta_red_packet t2
37
             ta_red_packet t2
36
         WHERE
38
         WHERE