傅行帆 4 years ago
parent
commit
98fc83661a

+ 8
- 0
src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java View File

11
 import com.huiju.estateagents.drainage.entity.TaDrainage;
11
 import com.huiju.estateagents.drainage.entity.TaDrainage;
12
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
12
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
13
 import com.huiju.estateagents.entity.ExtendContent;
13
 import com.huiju.estateagents.entity.ExtendContent;
14
+import com.huiju.estateagents.entity.TaPerson;
14
 import com.huiju.estateagents.entity.TaPersonBuilding;
15
 import com.huiju.estateagents.entity.TaPersonBuilding;
16
+import com.huiju.estateagents.mapper.TaPersonMapper;
15
 import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
17
 import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
16
 import com.huiju.estateagents.service.IExtendContentService;
18
 import com.huiju.estateagents.service.IExtendContentService;
17
 import com.huiju.estateagents.third.entity.TaMpInfo;
19
 import com.huiju.estateagents.third.entity.TaMpInfo;
55
     @Autowired
57
     @Autowired
56
     public ITaMpInfoService iTaMpInfoService;
58
     public ITaMpInfoService iTaMpInfoService;
57
 
59
 
60
+    @Autowired
61
+    public TaPersonMapper taPersonMapper;
62
+
58
     /**
63
     /**
59
      * 分页查询列表
64
      * 分页查询列表
60
      *
65
      *
313
                                       HttpServletRequest request) {
318
                                       HttpServletRequest request) {
314
         ResponseBean responseBean = new ResponseBean();
319
         ResponseBean responseBean = new ResponseBean();
315
         try {
320
         try {
321
+            TaPerson taPerson = taPersonMapper.selectById(getPersonId(request));
322
+
316
             TaDrainage taDrainage = iTaDrainageService.getById(id);
323
             TaDrainage taDrainage = iTaDrainageService.getById(id);
324
+            taDrainage.setShareTitle(taDrainage.getShareTitle().replace("{name}",taPerson.getNickname()));
317
             QueryWrapper<TaMpInfo> queryWrapper = new QueryWrapper<>();
325
             QueryWrapper<TaMpInfo> queryWrapper = new QueryWrapper<>();
318
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
326
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
319
             queryWrapper.eq("org_id", 0);
327
             queryWrapper.eq("org_id", 0);

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

497
 			WxPaySendRedpackResult wxPaySendRedpackResult = wxPayService.sendRedpack(build);
497
 			WxPaySendRedpackResult wxPaySendRedpackResult = wxPayService.sendRedpack(build);
498
 			String resultCode = wxPaySendRedpackResult.getResultCode();
498
 			String resultCode = wxPaySendRedpackResult.getResultCode();
499
 			if (resultCode.equals("SUCCESS")){
499
 			if (resultCode.equals("SUCCESS")){
500
+				taRedPacketMoney.setPacketSendedNum(taRedPacketMoney.getPacketSendedNum() + 1);
501
+				taRedPacketmonetMapper.updateById(taRedPacketMoney);
500
 				//插入订单表并扣钱反更新
502
 				//插入订单表并扣钱反更新
501
-				saveRedpacketOrder(tradeNo,wxPaySendRedpackResult,parentMpMiniapp,taRedPacketHelp,orgId,mpAppid,redPacketPerson);
503
+				saveRedpacketOrder(tradeNo,wxPaySendRedpackResult,parentMpMiniapp,taRedPacketHelp,orgId,mpAppid,redPacketPerson,taRedPacketClient);
502
 			}else {
504
 			}else {
503
 				return;
505
 				return;
504
 			}
506
 			}
507
 		}
509
 		}
508
 	}
510
 	}
509
 
511
 
510
-	private synchronized void saveRedpacketOrder(String tradeNo, WxPaySendRedpackResult wxPaySendRedpackResult, TaMpMiniapp parentMpMiniapp, TaRedPacketHelp taRedPacketHelp, Integer orgId, String mpAppid,TaRedPacketPerson redPacketPerson) {
512
+	private synchronized void saveRedpacketOrder(String tradeNo, WxPaySendRedpackResult wxPaySendRedpackResult, TaMpMiniapp parentMpMiniapp, TaRedPacketHelp taRedPacketHelp, Integer orgId, String mpAppid,TaRedPacketPerson redPacketPerson,TaRedPacketClient taRedPacketClient) {
511
 		redPacketPerson.setPacketAmount(wxPaySendRedpackResult.getTotalAmount());
513
 		redPacketPerson.setPacketAmount(wxPaySendRedpackResult.getTotalAmount());
512
 		redPacketPerson.setPacketStatus(1);
514
 		redPacketPerson.setPacketStatus(1);
513
 		redPacketPerson.setIsSuccess(true);
515
 		redPacketPerson.setIsSuccess(true);
530
 		taOrgOrder.setStatus(CommConstant.STATUS_NORMAL);
532
 		taOrgOrder.setStatus(CommConstant.STATUS_NORMAL);
531
 		taOrgOrder.setTradeNo(tradeNo);
533
 		taOrgOrder.setTradeNo(tradeNo);
532
 		taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_SUCCESS);
534
 		taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_SUCCESS);
535
+		taOrgOrder.setExpiryDate(LocalDateTime.now().plusMinutes(30));
536
+		taOrgOrder.setRemark(taRedPacketClient.getRemark());
537
+		taOrgOrder.setUserId(0);
538
+		taOrgOrder.setUserName("当前系统");
533
 		taOrgOrderMapper.insert(taOrgOrder);
539
 		taOrgOrderMapper.insert(taOrgOrder);
534
 
540
 
535
 		//插入组织订单明细表
541
 		//插入组织订单明细表
557
 		taOrgAccountDetailedList.setOrgId(orgId);
563
 		taOrgAccountDetailedList.setOrgId(orgId);
558
 		taOrgAccountDetailedList.setSignType(-1);
564
 		taOrgAccountDetailedList.setSignType(-1);
559
 		taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
565
 		taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
566
+		taOrgAccountDetailedList.setRemark(taRedPacketClient.getRemark());
567
+		taOrgAccountDetailedList.setUserId(0);
568
+		taOrgAccountDetailedList.setUserName("当前系统");
560
 		taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
569
 		taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
561
 
570
 
562
 	}
571
 	}