Rentalorder(update)

src/main/java/com/mmc/oms/dao/RentalOrdersDao.java

@@ -59,4 +59,6 @@ public interface RentalOrdersDao {
     CouponDO couponMoney(Integer couponId);
 
     List<TranStatusDicDO> listTranStatus();
+
+    List<OrderInfoDO> listPcOrderInfoRental(OrderInfoQO param);
 }

src/main/java/com/mmc/oms/service/Impl/RentalOrdersServiceImpl.java

@@ -312,7 +312,6 @@ public class RentalOrdersServiceImpl implements RentalOrdersService {
             return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
         }
         Integer pageNo = param.getPageNo();
-        param.setRepoAccountId(cuser.getUserAccountId());
         param.buildCurrentPage();
         List<OrderInfoDTO> data =
                 rentalOrdersDao.listPcOrderInfo(param).stream()
@@ -332,6 +331,7 @@ public class RentalOrdersServiceImpl implements RentalOrdersService {
             return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
         }
         Integer pageNo = param.getPageNo();
+        param.setRepoAccountId(account.getUserAccountId());
         param.buildCurrentPage();
         List<OrderInfoDTO> data =
                 rentalOrdersDao.listPageOrderInfo(param).stream()
@@ -396,9 +396,10 @@ public class RentalOrdersServiceImpl implements RentalOrdersService {
             return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
         }
         Integer pageNo = param.getPageNo();
+        param.setRepoAccountId(currentAccount.getUserAccountId());
         param.buildCurrentPage();
         List<OrderInfoDTO> data =
-                rentalOrdersDao.listPcOrderInfo(param).stream()
+                rentalOrdersDao.listPcOrderInfoRental(param).stream()
                         .map(
                                 d -> {
                                     return d.buildOrderInfoDTO();

src/main/resources/mapper/RentalOrdersDao.xml

@@ -271,7 +271,72 @@
     <select id="listPcOrderInfo" resultMap="orderInfoResultMap" parameterType="com.mmc.oms.model.qo.OrderInfoQO">
         select o.id,o.order_no,o.ware_title,o.sku_title,o.ware_img,o.deposit,
         o.unit_price,o.ware_num,o.buyer_name,o.buyer_phone,o.uid,o.remark,
-        o.tran_status,o.should_pay,o.actual_pay,o.pf_remark,o.create_time,o.ware_no,o.nick_name,o.repo_account_id
+        o.tran_status,o.should_pay,o.actual_pay,o.pf_remark,o.create_time,o.ware_no,o.nick_name,o.repo_account_id,
+        rp.order_info_id,rp.receipt_method,rp.take_name,
+        rp.take_phone,rp.region,rp.detail_address,rp.repo_name,rp.repo_address,
+        rp.book_phone,rp.send_ex_code,rp.send_ex_no,rp.send_address,rp.ren_method,
+        rp.ren_phone,rp.ren_name,rp.ren_ex_code,rp.ren_ex_no,rp.ren_address,rp.ren_repo_name,
+        rp.ren_repo_addr,rp.ren_repo_phone,
+        ts.doing ,
+        ts.waiting,
+        ts.lease_order_status
+        from order_info o
+        inner join order_receipt rp on rp.order_info_id=o.id
+        LEFT JOIN tran_status_dic ts on ts.`status` =o.tran_status
+        <where>1=1
+            <if test=" buyerAccount != null and buyerAccount != '' ">
+                and (
+                o.uid like CONCAT('%',#{buyerAccount},'%')
+                or o.nick_name like CONCAT('%',#{buyerAccount},'%')
+                or o.buyer_name like CONCAT('%',#{buyerAccount},'%')
+                )
+            </if>
+            <if test=" orderNo != null and orderNo != '' ">
+                and (
+                o.order_no like CONCAT('%',#{orderNo},'%')
+                )
+            </if>
+
+            <if test=" wareNo != null and wareNo != '' ">
+                and (
+                o.ware_no like CONCAT('%',#{wareNo},'%')
+                )
+            </if>
+
+            <if test=" wareTitle != null and wareTitle != '' ">
+                and (
+                o.ware_title like CONCAT('%',#{wareTitle},'%')
+                )
+            </if>
+            <if test=" startTime != null and startTime != '' ">
+                and o.create_time &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test=" endTime != null and endTime != '' ">
+                and o.create_time &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test=" tranStatus != null and tranStatus != '' ">
+                and o.tran_status = #{tranStatus}
+            </if>
+            <if test=" userIds != null">
+                <foreach collection="userIds" item="id" open="and o.repo_account_id in (" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+            <if test=" companys != null ">
+                <foreach collection="companys" item="id" open="and o.rcd_company_id in (" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
+        order by o.create_time DESC
+        limit #{pageNo},#{pageSize}
+    </select>
+
+
+    <select id="listPcOrderInfoRental" resultMap="orderInfoResultMap" parameterType="com.mmc.oms.model.qo.OrderInfoQO">
+        select o.id,o.order_no,o.ware_title,o.sku_title,o.ware_img,o.deposit,
+        o.unit_price,o.ware_num,o.buyer_name,o.buyer_phone,o.uid,o.remark,
+        o.tran_status,o.should_pay,o.actual_pay,o.pf_remark,o.create_time,o.ware_no,o.nick_name,o.repo_account_id,
         rp.order_info_id,rp.receipt_method,rp.take_name,
         rp.take_phone,rp.region,rp.detail_address,rp.repo_name,rp.repo_address,
         rp.book_phone,rp.send_ex_code,rp.send_ex_no,rp.send_address,rp.ren_method,