优化代码

java110-bean/src/main/java/com/java110/dto/order/BusinessDto.java

@@ -12,6 +12,7 @@ public class BusinessDto  extends PageDto implements Serializable {
     private String oId;
 
     private String bId;
+    private String[] bIds;
 
     private String businessTypeCd;
 
@@ -59,4 +60,12 @@ public class BusinessDto  extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getbIds() {
+        return bIds;
+    }
+
+    public void setbIds(String[] bIds) {
+        this.bIds = bIds;
+    }
 }

java110-bean/src/main/java/com/java110/dto/order/OrderDto.java

@@ -17,6 +17,7 @@ public class OrderDto extends PageDto implements Serializable {
     private String appId;
     private String extTransactionId;
     private String userId;
+    private String userName;
     private String requestTime;
     private String orderTypeCd;
     private String finishTime;
@@ -32,6 +33,7 @@ public class OrderDto extends PageDto implements Serializable {
     private String[] businessTypeCds;
 
 
+
     public String getoId() {
         return oId;
     }
@@ -127,4 +129,12 @@ public class OrderDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 }

java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java

@@ -32,6 +32,7 @@ public class OwnerCarDto extends PageDto implements Serializable {
     private String ownerId;
     private String userId;
     private String carId;
+    private String[] carIds;
     private boolean withOwner =false;
     private String ownerName;
     private String idCard;
@@ -272,4 +273,12 @@ public class OwnerCarDto extends PageDto implements Serializable {
     public void setbId(String bId) {
         this.bId = bId;
     }
+
+    public String[] getCarIds() {
+        return carIds;
+    }
+
+    public void setCarIds(String[] carIds) {
+        this.carIds = carIds;
+    }
 }

java110-bean/src/main/java/com/java110/dto/payFeeAudit/PayFeeAuditDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.payFeeAudit;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,12 +16,26 @@ import java.util.Date;
 public class PayFeeAuditDto extends PageDto implements Serializable {
 
     private String auditUserId;
-private String auditUserName;
-private String feeDetailId;
-private String state;
-private String message;
-private String communityId;
-private String feeId;
+    private String auditUserName;
+    private String feeDetailId;
+    private String state;
+    private String message;
+    private String communityId;
+    private String feeId;
+    private String payerObjId;
+    private String payerObjName;
+    private String payerObjType;
+    private String feeName;
+    private String cycles;
+    private String startTime;
+    private String endTime;
+    private String receivableAmount;
+    private String receivedAmount;
+    private String remark;
+    private String userId;
+    private String userName;
+    private String bId;
+
 
 
     private Date createTime;
@@ -31,43 +46,56 @@ private String feeId;
     public String getAuditUserId() {
         return auditUserId;
     }
-public void setAuditUserId(String auditUserId) {
+
+    public void setAuditUserId(String auditUserId) {
         this.auditUserId = auditUserId;
     }
-public String getAuditUserName() {
+
+    public String getAuditUserName() {
         return auditUserName;
     }
-public void setAuditUserName(String auditUserName) {
+
+    public void setAuditUserName(String auditUserName) {
         this.auditUserName = auditUserName;
     }
-public String getFeeDetailId() {
+
+    public String getFeeDetailId() {
         return feeDetailId;
     }
-public void setFeeDetailId(String feeDetailId) {
+
+    public void setFeeDetailId(String feeDetailId) {
         this.feeDetailId = feeDetailId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getMessage() {
+
+    public String getMessage() {
         return message;
     }
-public void setMessage(String message) {
+
+    public void setMessage(String message) {
         this.message = message;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
 
@@ -87,4 +115,108 @@ public void setFeeId(String feeId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getPayerObjId() {
+        return payerObjId;
+    }
+
+    public void setPayerObjId(String payerObjId) {
+        this.payerObjId = payerObjId;
+    }
+
+    public String getPayerObjType() {
+        return payerObjType;
+    }
+
+    public void setPayerObjType(String payerObjType) {
+        this.payerObjType = payerObjType;
+    }
+
+    public String getFeeName() {
+        return feeName;
+    }
+
+    public void setFeeName(String feeName) {
+        this.feeName = feeName;
+    }
+
+    public String getCycles() {
+        return cycles;
+    }
+
+    public void setCycles(String cycles) {
+        this.cycles = cycles;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getReceivableAmount() {
+        return receivableAmount;
+    }
+
+    public void setReceivableAmount(String receivableAmount) {
+        this.receivableAmount = receivableAmount;
+    }
+
+    public String getReceivedAmount() {
+        return receivedAmount;
+    }
+
+    public void setReceivedAmount(String receivedAmount) {
+        this.receivedAmount = receivedAmount;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getPayerObjName() {
+        return payerObjName;
+    }
+
+    public void setPayerObjName(String payerObjName) {
+        this.payerObjName = payerObjName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
 }

java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java

@@ -4,6 +4,7 @@ import com.java110.dto.fee.FeeDto;
 import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -55,6 +56,12 @@ public interface IComputeFeeSMO {
      */
     public String getFeeObjName(FeeDto feeDto);
 
+    /**
+     * 刷入 付费方名称
+     * @param feeDtos
+     */
+    public void freshFeeObjName(List<FeeDto> feeDtos);
+
     /**
      * 根据缴费周期计算 结束时间
      *

java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java

@@ -284,6 +284,131 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         return objName;
     }
 
+    @Override
+    public void freshFeeObjName(List<FeeDto> feeDtos) {
+
+        List<String> roomIds = new ArrayList<>();
+        List<String> carIds = new ArrayList<>();
+        for (FeeDto feeDto : feeDtos) {
+            if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) {
+                roomIds.add(feeDto.getPayerObjId());
+            } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {
+                carIds.add(feeDto.getPayerObjId());
+            }
+        }
+
+        // 用房屋信息刷 费用付费对象
+        freshFeeObjNameByRoomId(feeDtos, roomIds);
+
+        // 用车辆车位 刷 付费对象
+        freshFeeObjNameByCarId(feeDtos, carIds);
+
+    }
+
+    /**
+     * 刷费用
+     *
+     * @param feeDtos
+     * @param carIds
+     */
+    private void freshFeeObjNameByCarId(List<FeeDto> feeDtos, List<String> carIds) {
+
+        if (carIds.size() < 1) {
+            return;
+        }
+
+
+        OwnerCarDto ownerCarDto = new OwnerCarDto();
+        ownerCarDto.setCommunityId(feeDtos.get(0).getCommunityId());
+        ownerCarDto.setCarIds(carIds.toArray(new String[carIds.size()]));
+        List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+
+        if (ownerCarDtos == null || ownerCarDtos.size() < 1) {
+            return;
+        }
+
+        List<String> psIds = new ArrayList<>();
+
+        for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
+            if (StringUtil.isEmpty(tmpOwnerCarDto.getPsId()) || tmpOwnerCarDto.getPsId().startsWith("-")) {
+                continue;
+            }
+            psIds.add(tmpOwnerCarDto.getPsId());
+        }
+
+        //没有车位情况下
+        if (psIds.size() < 1) {
+            for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
+                for (FeeDto feeDto : feeDtos) {
+                    if (!FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {
+                        continue;
+                    }
+
+                    if (feeDto.getPayerObjId().equals(tmpOwnerCarDto.getCarId())) {
+                        feeDto.setPayerObjName(tmpOwnerCarDto.getCarNum());
+                    }
+                }
+            }
+            return;
+        }
+
+
+        ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+        parkingSpaceDto.setCommunityId(feeDtos.get(0).getCommunityId());
+        parkingSpaceDto.setPsIds(psIds.toArray(new String[psIds.size()]));
+        List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+        for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
+            for (ParkingSpaceDto tmpParkingSpaceDto : parkingSpaceDtos) {
+                if (tmpParkingSpaceDto.getPsId().equals(tmpOwnerCarDto.getPsId())) {
+                    tmpOwnerCarDto.setAreaNum(tmpParkingSpaceDto.getAreaNum());
+                    tmpOwnerCarDto.setNum(tmpParkingSpaceDto.getNum());
+                }
+            }
+        }
+        for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
+            for (FeeDto feeDto : feeDtos) {
+                if (!FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {
+                    continue;
+                }
+
+                if (feeDto.getPayerObjId().equals(tmpOwnerCarDto.getCarId())) {
+                    feeDto.setPayerObjName(tmpOwnerCarDto.getCarNum() + "(" + tmpOwnerCarDto.getAreaNum() + "停车场" + tmpOwnerCarDto.getNum() + "车位)");
+                }
+            }
+        }
+
+    }
+
+    /**
+     * 用房屋信息刷付费方名称
+     *
+     * @param feeDtos
+     * @param roomIds
+     */
+    private void freshFeeObjNameByRoomId(List<FeeDto> feeDtos, List<String> roomIds) {
+
+        if (roomIds.size() < 1) {
+            return;
+        }
+
+        RoomDto roomDto = new RoomDto();
+        roomDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
+        roomDto.setCommunityId(feeDtos.get(0).getCommunityId());
+        List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+        String objName = "";
+        for (RoomDto tmpRoomDto : roomDtos) {
+            for (FeeDto feeDto : feeDtos) {
+                if (!FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) {
+                    continue;
+                }
+                if (tmpRoomDto.getRoomId().equals(feeDto.getPayerObjId())) {
+                    objName = roomDto.getFloorNum() + "栋" + roomDto.getUnitNum() + "单元" + roomDto.getRoomNum() + "室";
+                    feeDto.setPayerObjName(objName);
+                }
+            }
+        }
+    }
+
     /**
      * 根据周期 计算费用状态
      *

java110-db/src/main/resources/mapper/center/CenterServiceDAOImplMapper.xml

@@ -175,6 +175,24 @@
 
         ]]>
     </select>
+    <select id="queryOrderByBId" parameterType="Map" resultType="Map">
+        select distinct co.app_id appId,co.o_id oId,co.create_time createTime,
+        co.ext_transaction_id extTransactionId,co.user_id userId,cb.b_id bId
+        from c_orders co
+        INNER JOIN c_business cb on co.o_id = cb.o_id
+        where 1=1
+        <if test="bId != null and bId != ''">
+            cb.b_id = #{bId}
+        </if>
+        <if test="bIds !=null">
+            and cb.b_id in
+            <foreach collection="bIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+    </select>
+
     <!-- 根据 OID 查询 business -->
     <select id="getBusinessByOId" parameterType="map" resultType="map">
         SELECT co.`o_id`,co.`app_id`,co.`order_type_cd`,co.`user_id`,cb.`business_type_cd`,cb.`b_id`,cb.`status_cd`

java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml

@@ -17,40 +17,30 @@
 
     <!-- 查询缴费审核信息 add by wuxw 2018-07-03 -->
     <select id="getPayFeeAuditInfo" parameterType="Map" resultType="Map">
-        select t.audit_user_id,t.audit_user_id auditUserId,t.audit_user_name,t.audit_user_name
-        auditUserName,t.fee_detail_id,t.fee_detail_id feeDetailId,t.status_cd,t.status_cd
-        statusCd,t.state,t.message,t.community_id,t.community_id communityId,t.fee_id,t.fee_id feeId,
-        t.audit_id auditId
-        from pay_fee_audit t
-        where 1 =1
-        <if test="auditUserId !=null and auditUserId != ''">
-            and t.audit_user_id= #{auditUserId}
-        </if>
-        <if test="auditUserName !=null and auditUserName != ''">
-            and t.audit_user_name= #{auditUserName}
-        </if>
-        <if test="feeDetailId !=null and feeDetailId != ''">
-            and t.fee_detail_id= #{feeDetailId}
+        select pf.payer_obj_id payerObjId,pf.payer_obj_type payerObjType,pfc.fee_name feeName,
+        pfd.cycles,pfd.start_time startTime,pfd.end_time endTime,pfd.receivable_amount receivableAmount,
+        pfd.received_amount receivedAmount,pfd.create_time createTime,pfa.state,pfa.message,pfd.remark,
+        pfa.audit_user_name auditUserName,pfd.b_id bId
+        from pay_fee_detail pfd
+        INNER JOIN pay_fee pf on pf.fee_id = pfd.fee_id and pf.community_id = pfd.community_id and pf.status_cd = '0'
+        inner join pay_fee_config pfc on pf.config_id = pfc.config_id and pf.community_id = pfc.community_id and pfc.status_cd = '0'
+        left join pay_fee_audit pfa on pf.fee_id = pfa.fee_id and pfd.detail_id = pfa.fee_detail_id and pfa.status_cd = '0'
+        where 1=1
+        and pfd.community_id = #{communityId}
+        and  pfd.status_cd = '0'
+        <if test="roomId !=null and roomId != ''">
+            and pf.payer_obj_id = #{roomId}
+            and pf.payer_obj_type = '3333'
         </if>
-        <if test="statusCd !=null and statusCd != ''">
-            and t.status_cd= #{statusCd}
+        <if test="carId !=null and carId != ''">
+            and pf.payer_obj_id = #{carId}
+            and pf.payer_obj_type = '6666'
         </if>
         <if test="state !=null and state != ''">
-            and t.state= #{state}
-        </if>
-        <if test="message !=null and message != ''">
-            and t.message= #{message}
-        </if>
-        <if test="communityId !=null and communityId != ''">
-            and t.community_id= #{communityId}
-        </if>
-        <if test="feeId !=null and feeId != ''">
-            and t.fee_id= #{feeId}
-        </if>
-        <if test="auditId !=null and auditId != ''">
-            and t.audit_id= #{auditId}
+            and (pfa.state is null
+            or pfa.state = #{state})
         </if>
-        order by t.create_time desc
+        ORDER BY pfd.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -94,34 +84,24 @@
     <!-- 查询缴费审核数量 add by wuxw 2018-07-03 -->
     <select id="queryPayFeeAuditsCount" parameterType="Map" resultType="Map">
         select count(1) count
-        from pay_fee_audit t
-        where 1 =1
-        <if test="auditUserId !=null and auditUserId != ''">
-            and t.audit_user_id= #{auditUserId}
-        </if>
-        <if test="auditUserName !=null and auditUserName != ''">
-            and t.audit_user_name= #{auditUserName}
-        </if>
-        <if test="feeDetailId !=null and feeDetailId != ''">
-            and t.fee_detail_id= #{feeDetailId}
+        from pay_fee_detail pfd
+        INNER JOIN pay_fee pf on pf.fee_id = pfd.fee_id and pf.community_id = pfd.community_id and pf.status_cd = '0'
+        inner join pay_fee_config pfc on pf.config_id = pfc.config_id and pf.community_id = pfc.community_id and pfc.status_cd = '0'
+        left join pay_fee_audit pfa on pf.fee_id = pfa.fee_id and pfd.detail_id = pfa.fee_detail_id and pfa.status_cd = '0'
+        where 1=1
+        and pfd.community_id = #{communityId}
+        and  pfd.status_cd = '0'
+        <if test="roomId !=null and roomId != ''">
+            and pf.payer_obj_id = #{roomId}
+            and pf.payer_obj_type = '3333'
         </if>
-        <if test="statusCd !=null and statusCd != ''">
-            and t.status_cd= #{statusCd}
+        <if test="carId !=null and carId != ''">
+            and pf.payer_obj_id = #{carId}
+            and pf.payer_obj_type = '6666'
         </if>
         <if test="state !=null and state != ''">
-            and t.state= #{state}
-        </if>
-        <if test="message !=null and message != ''">
-            and t.message= #{message}
-        </if>
-        <if test="communityId !=null and communityId != ''">
-            and t.community_id= #{communityId}
-        </if>
-        <if test="feeId !=null and feeId != ''">
-            and t.fee_id= #{feeId}
-        </if>
-        <if test="auditId !=null and auditId != ''">
-            and t.audit_id= #{auditId}
+            and (pfa.state is null
+            or pfa.state = #{state})
         </if>
 
 

java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml

@@ -165,6 +165,12 @@
         <if test="carId !=null and carId != ''">
             and t.car_id= #{carId}
         </if>
+        <if test="carIds !=null">
+            and t.car_id in
+            <foreach collection="carIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>

java110-interface/src/main/java/com/java110/intf/order/IOrderInnerServiceSMO.java

@@ -55,6 +55,14 @@ public interface IOrderInnerServiceSMO {
     @RequestMapping(value = "/queryOrderByBusinessType", method = RequestMethod.POST)
     public List<OrderDto> queryOrderByBusinessType(@RequestBody OrderDto orderDto);
 
+    /**
+     * 根据
+     * @param businessDto
+     * @return
+     */
+    @RequestMapping(value = "/queryOrderByBId", method = RequestMethod.POST)
+    public List<OrderDto> queryOrderByBId(@RequestBody BusinessDto businessDto);
+
     @RequestMapping(value = "/updateBusinessStatusCd", method = RequestMethod.POST)
     int updateBusinessStatusCd(@RequestBody OrderDto orderDto);
 

service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/GetPayFeeAuditBMOImpl.java

@@ -1,8 +1,15 @@
 package com.java110.fee.bmo.payFeeAudit.impl;
 
+import com.java110.core.smo.IComputeFeeSMO;
+import com.java110.dto.fee.FeeDto;
+import com.java110.dto.order.BusinessDto;
+import com.java110.dto.order.OrderDto;
 import com.java110.dto.payFeeAudit.PayFeeAuditDto;
 import com.java110.fee.bmo.payFeeAudit.IGetPayFeeAuditBMO;
 import com.java110.intf.IPayFeeAuditInnerServiceSMO;
+import com.java110.intf.order.IOrderInnerServiceSMO;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -18,6 +25,12 @@ public class GetPayFeeAuditBMOImpl implements IGetPayFeeAuditBMO {
     @Autowired
     private IPayFeeAuditInnerServiceSMO payFeeAuditInnerServiceSMOImpl;
 
+    @Autowired
+    private IComputeFeeSMO computeFeeSMOImpl;
+
+    @Autowired
+    private IOrderInnerServiceSMO orderInnerServiceSMOImpl;
+
     /**
      * @param payFeeAuditDto
      * @return 订单服务能够接受的报文
@@ -30,6 +43,8 @@ public class GetPayFeeAuditBMOImpl implements IGetPayFeeAuditBMO {
         List<PayFeeAuditDto> payFeeAuditDtos = null;
         if (count > 0) {
             payFeeAuditDtos = payFeeAuditInnerServiceSMOImpl.queryPayFeeAudits(payFeeAuditDto);
+
+            frashRoomAndStaff(payFeeAuditDtos);
         } else {
             payFeeAuditDtos = new ArrayList<>();
         }
@@ -41,4 +56,38 @@ public class GetPayFeeAuditBMOImpl implements IGetPayFeeAuditBMO {
         return responseEntity;
     }
 
+    private void frashRoomAndStaff(List<PayFeeAuditDto> payFeeAuditDtos) {
+
+        List<FeeDto> feeDtos = BeanConvertUtil.covertBeanList(payFeeAuditDtos, FeeDto.class);
+        computeFeeSMOImpl.freshFeeObjName(feeDtos);
+        List<String> bIds = new ArrayList<>();
+        for (PayFeeAuditDto payFeeAuditDto : payFeeAuditDtos) {
+            for (FeeDto feeDto : feeDtos) {
+                if (payFeeAuditDto.getFeeId().equals(feeDto.getFeeId())) {
+                    payFeeAuditDto.setPayerObjName(feeDto.getPayerObjName());
+                }
+            }
+
+            if (StringUtil.isEmpty(payFeeAuditDto.getbId()) || payFeeAuditDto.getbId().startsWith("-")) {
+                continue;
+            }
+
+            bIds.add(payFeeAuditDto.getbId());
+        }
+        BusinessDto businessDto = new BusinessDto();
+        businessDto.setbIds(bIds.toArray(new String[bIds.size()]));
+        List<OrderDto> orderDtos = orderInnerServiceSMOImpl.queryOrderByBId(businessDto);
+
+        for (PayFeeAuditDto payFeeAuditDto : payFeeAuditDtos) {
+            for (OrderDto orderDto : orderDtos) {
+                if (payFeeAuditDto.getbId().equals(orderDto.getbId())) {
+                    payFeeAuditDto.setUserId(orderDto.getUserId());
+                    payFeeAuditDto.setUserName(orderDto.getUserName());
+                }
+            }
+        }
+
+
+    }
+
 }

service-order/src/main/java/com/java110/order/dao/ICenterServiceDAO.java

@@ -218,6 +218,15 @@ public interface ICenterServiceDAO {
      */
     public List<Map> queryOrderByBusinessType(Map info);
 
+
+    /**
+     * 根据业务类型查询 订单
+     * @param info
+     * @return
+     */
+    public List<Map> queryOrderByBId(Map info);
+
+
     /**
      * 查询业主 添加 修改 删除订单
      *

service-order/src/main/java/com/java110/order/dao/impl/CenterServiceDAOImpl.java

@@ -373,6 +373,17 @@ public class CenterServiceDAOImpl extends BaseServiceDao implements ICenterServi
         return sqlSessionTemplate.selectList("centerServiceDAOImpl.queryOrderByBusinessType", info);
     }
 
+    /**
+     * 查询业主订单
+     *
+     * @param info
+     * @return
+     */
+    @Override
+    public List<Map> queryOrderByBId(Map info) {
+        return sqlSessionTemplate.selectList("centerServiceDAOImpl.queryOrderByBId", info);
+    }
+
     public int updateBusinessStatusCd(Map info) {
         return sqlSessionTemplate.update("centerServiceDAOImpl.updateBusinessStatusCd", info);
     }

service-order/src/main/java/com/java110/order/smo/impl/OrderInnerServiceSMOImpl.java

@@ -2,16 +2,19 @@ package com.java110.order.smo.impl;
 
 
 import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.intf.order.IOrderInnerServiceSMO;
-import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.dto.order.BusinessDto;
 import com.java110.dto.order.OrderDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.order.IOrderInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.order.dao.ICenterServiceDAO;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -66,7 +69,49 @@ public class OrderInnerServiceSMOImpl extends BaseServiceSMO implements IOrderIn
         return BeanConvertUtil.covertBeanList(centerServiceDAOImpl.queryOrderByBusinessType(BeanConvertUtil.beanCovertMap(orderDto)), OrderDto.class);
     }
 
-    public int updateBusinessStatusCd(@RequestBody OrderDto orderDto){
+    public List<OrderDto> queryOrderByBId(@RequestBody BusinessDto businessDto) {
+        List<OrderDto> orderDtos = BeanConvertUtil.covertBeanList(centerServiceDAOImpl.queryOrderByBId(BeanConvertUtil.beanCovertMap(businessDto)), OrderDto.class);
+
+        if (orderDtos == null || orderDtos.size() < 1) {
+            return orderDtos;
+        }
+        String[] userIds = getUserIds(orderDtos);
+        //根据 userId 查询用户信息
+        List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+
+        for (OrderDto orderDto : orderDtos) {
+            for (UserDto userDto : users) {
+                if (orderDto.getUserId().equals(userDto.getUserId())) {
+                    orderDto.setUserName(userDto.getUserName());
+                    break;
+                }
+            }
+        }
+        return orderDtos;
+    }
+
+    /**
+     * 获取批量userId
+     *
+     * @param orderDtos 小区楼信息
+     * @return 批量userIds 信息
+     */
+    private String[] getUserIds(List<OrderDto> orderDtos) {
+        List<String> userIds = new ArrayList<String>();
+        for (OrderDto orderDto : orderDtos) {
+
+            if (StringUtil.isEmpty(orderDto.getUserId()) || orderDto.getUserId().startsWith("-")) {
+                continue;
+            }
+            userIds.add(orderDto.getUserId());
+
+        }
+
+        return userIds.toArray(new String[userIds.size()]);
+    }
+
+
+    public int updateBusinessStatusCd(@RequestBody OrderDto orderDto) {
         return centerServiceDAOImpl.updateBusinessStatusCd(BeanConvertUtil.beanCovertMap(orderDto));
     }
 
@@ -81,16 +126,17 @@ public class OrderInnerServiceSMOImpl extends BaseServiceSMO implements IOrderIn
      * @param orderDto 数据对象分享
      * @return OrderDto 对象数据
      */
-    public List<OrderDto> queryApplicationKeyOrders(@RequestBody OrderDto orderDto){
+    public List<OrderDto> queryApplicationKeyOrders(@RequestBody OrderDto orderDto) {
         return BeanConvertUtil.covertBeanList(centerServiceDAOImpl.queryApplicationKeyOrders(BeanConvertUtil.beanCovertMap(orderDto)), OrderDto.class);
     }
 
     /**
      * 查询 同订单 订单项
+     *
      * @param businessDto
      * @return
      */
-    public List<BusinessDto> querySameOrderBusiness(@RequestBody BusinessDto businessDto){
+    public List<BusinessDto> querySameOrderBusiness(@RequestBody BusinessDto businessDto) {
         return BeanConvertUtil.covertBeanList(centerServiceDAOImpl.querySameOrderBusiness(BeanConvertUtil.beanCovertMap(businessDto)), BusinessDto.class);
     }