Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -11,7 +11,9 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.entity.ExtendContent;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.third.entity.TaMpInfo;
@@ -55,6 +57,9 @@ public class    TaDrainageController extends BaseController {
     @Autowired
     public ITaMpInfoService iTaMpInfoService;
 
+    @Autowired
+    public TaPersonMapper taPersonMapper;
+
     /**
      * 分页查询列表
      *
@@ -313,7 +318,10 @@ public class    TaDrainageController extends BaseController {
                                       HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            TaPerson taPerson = taPersonMapper.selectById(getPersonId(request));
+
             TaDrainage taDrainage = iTaDrainageService.getById(id);
+            taDrainage.setShareTitle(taDrainage.getShareTitle().replace("{name}",taPerson.getNickname()));
             QueryWrapper<TaMpInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.eq("org_id", 0);

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

@@ -552,8 +552,10 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 			WxPaySendRedpackResult wxPaySendRedpackResult = wxPayService.sendRedpack(build);
 			String resultCode = wxPaySendRedpackResult.getResultCode();
 			if (resultCode.equals("SUCCESS")){
+				taRedPacketMoney.setPacketSendedNum(taRedPacketMoney.getPacketSendedNum() + 1);
+				taRedPacketmonetMapper.updateById(taRedPacketMoney);
 				//插入订单表并扣钱反更新
-				saveRedpacketOrder(tradeNo,wxPaySendRedpackResult,parentMpMiniapp,taRedPacketHelp,orgId,mpAppid,redPacketPerson);
+				saveRedpacketOrder(tradeNo,wxPaySendRedpackResult,parentMpMiniapp,taRedPacketHelp,orgId,mpAppid,redPacketPerson,taRedPacketClient);
 			}else {
 				return;
 			}
@@ -562,7 +564,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		}
 	}
 
-	private synchronized void saveRedpacketOrder(String tradeNo, WxPaySendRedpackResult wxPaySendRedpackResult, TaMpMiniapp parentMpMiniapp, TaRedPacketHelp taRedPacketHelp, Integer orgId, String mpAppid,TaRedPacketPerson redPacketPerson) {
+	private synchronized void saveRedpacketOrder(String tradeNo, WxPaySendRedpackResult wxPaySendRedpackResult, TaMpMiniapp parentMpMiniapp, TaRedPacketHelp taRedPacketHelp, Integer orgId, String mpAppid,TaRedPacketPerson redPacketPerson,TaRedPacketClient taRedPacketClient) {
 		redPacketPerson.setPacketAmount(wxPaySendRedpackResult.getTotalAmount());
 		redPacketPerson.setPacketStatus(1);
 		redPacketPerson.setIsSuccess(true);
@@ -585,6 +587,10 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		taOrgOrder.setStatus(CommConstant.STATUS_NORMAL);
 		taOrgOrder.setTradeNo(tradeNo);
 		taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_SUCCESS);
+		taOrgOrder.setExpiryDate(LocalDateTime.now().plusMinutes(30));
+		taOrgOrder.setRemark(taRedPacketClient.getRemark());
+		taOrgOrder.setUserId(0);
+		taOrgOrder.setUserName("当前系统");
 		taOrgOrderMapper.insert(taOrgOrder);
 
 		//插入组织订单明细表
@@ -612,6 +618,9 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		taOrgAccountDetailedList.setOrgId(orgId);
 		taOrgAccountDetailedList.setSignType(-1);
 		taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
+		taOrgAccountDetailedList.setRemark(taRedPacketClient.getRemark());
+		taOrgAccountDetailedList.setUserId(0);
+		taOrgAccountDetailedList.setUserName("当前系统");
 		taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
 
 	}