Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

src/main/java/com/huiju/estateagents/property/service/impl/BillInvoiceServiceImpl.java

@@ -182,7 +182,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
                 // 插入流水
                 BillStatement billStatement = new BillStatement();
-                billStatement.setOrgId(1);
+                billStatement.setOrgId(billInvoice.getOrgId());
                 billStatement.setBillInvoiceId(billInvoice.getId());
                 billStatement.setTaUserId(billInvoice.getTaUserId());
                 billStatement.setPayPrice(billInvoice.getPayPrice());
@@ -212,7 +212,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
                 // 生成订单
                 TpBillOrder tpBillOrder = new TpBillOrder();
-                tpBillOrder.setOrgId(1);
+                tpBillOrder.setOrgId(billInvoice.getOrgId());
                 tpBillOrder.setTpBillId(billInvoice.getBillId());
                 tpBillOrder.setTpBillInvoiceId(billInvoice.getId());
 

src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java

@@ -365,7 +365,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         taUserVerify.setRoleId(sysRole.getId());
         taUserVerify.setPersonId(personId);
         taUserVerify.setVerifyStatus("0");
-        taUserVerify.setOrgId(1);
+        taUserVerify.setOrgId(taUserVerify.getOrgId());
         taUserVerify.setCreateDate(LocalDateTime.now());
         taUserVerify.setPhaseName(phase.getName());
         taUserVerify.setBuildingName(building.getName());

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -141,7 +141,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         QueryWrapper<TaUser> taUserQueryWrapper =new QueryWrapper<>();
         taUserQueryWrapper.eq("org_id",orgId);
         taUserQueryWrapper.ne("user_id",userID);
-        taUserQueryWrapper.eq("type","prop");
+        taUserQueryWrapper.eq("type","life-consultant");
         ticketVO.setTpUsersList(taUserMapper.selectList(taUserQueryWrapper));
         /*本人*/
         ticketVO.setCurrentUserName(userID.toString());
@@ -691,8 +691,10 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
          * 工单表 -> 工单处理表 -> 消息表
          * 依次插入相关数据, 该工单默认的第一条数据(待分配), 是工单标题,
          */
+        TaPerson taPerson = taPersonMapper.selectById(personId);
 
-        tpTicket.setOrgId(1);
+
+        tpTicket.setOrgId(taPerson.getOrgId());
         // 2.1以后为ta_user_verify为中心不再是已用户ta_user为中心
         tpTicket.setPersonId(personId);
         // 默认待分配
@@ -716,7 +718,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         TpTicketRecord tpTicketRecord = new TpTicketRecord();
         //获取当前插入的信息，维护工单记录表
         TpTicket tpTicketReco = tpTicketMapper.selectById(id);
-        tpTicketRecord.setOrgId(1);
+        tpTicketRecord.setOrgId(taPerson.getOrgId());
         tpTicketRecord.setTicketId(tpTicketReco.getId());
         // 1：投诉   2：报修 3：联系物业
         String typeName = "2".equals(tpTicket.getType()) ? "报修" : "1".equals(tpTicket.getType()) ? "投诉" : "3".equals(tpTicket.getType()) ? "联系工单" : "未知类型";

src/main/java/com/huiju/estateagents/property/service/impl/WxPayServiceImpl.java

@@ -255,7 +255,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 			//插入流水账单表
 			BillStatement tpBillStatement = new BillStatement();
 			tpBillStatement.setBillInvoiceId(tpBillInvoice.getId());
-			tpBillStatement.setOrgId(1);
+			tpBillStatement.setOrgId(billOrder.getOrgId());
 			tpBillStatement.setTaUserId(tpBillInvoice.getTaUserId());
 			tpBillStatement.setPayPrice(tpBillInvoice.getPayPrice());
 			tpBillStatement.setPayName(tpBillInvoice.getPayName());
@@ -370,7 +370,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 				}
 
 				TpBillOrder tpBillOrder = new TpBillOrder();
-				tpBillOrder.setOrgId(1);
+				tpBillOrder.setOrgId(tpBillInvoice.getOrgId());
 				tpBillOrder.setTpBillId(tpBillInvoice.getBillId());
 				tpBillOrder.setTpBillInvoiceId(tpBillInvoice.getId());
 				tpBillOrder.setCreateDate(LocalDateTime.now());