解决商家终端商城用户获取订单没有数据问题

cereshop-app/src/main/java/com/shop/cereshop/app/param/order/OrderGetAllParam.java

@@ -38,4 +38,9 @@ public class OrderGetAllParam extends PageParam {
      * 页大小
      */
     private Integer page;
+
+    /**
+     * 商家id
+     */
+    private String businessId;
 }

cereshop-app/src/main/java/com/shop/cereshop/app/service/buyer/impl/CereBuyerUserServiceImpl.java

@@ -718,6 +718,7 @@ public class CereBuyerUserServiceImpl implements CereBuyerUserService {
         // 已完成订单，但未满15天
         OrderGetAllParam orderGetAllParam = new OrderGetAllParam();
         orderGetAllParam.setBuyerUserId(user.getBuyerUserId());
+        orderGetAllParam.setBusinessId(user.getProject());
         orderGetAllParam.setState("4");
         List<Orders> completedList = cereShopOrderDAO.getAll(orderGetAllParam);
         // 校验时间

cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java

@@ -1044,6 +1044,7 @@ public class CereShopOrderServiceImpl implements CereShopOrderService {
     @Override
     public Page getAll(OrderGetAllParam param, CereBuyerUser user) throws CoBusinessException, Exception {
         param.setBuyerUserId(user.getBuyerUserId());
+        param.setBusinessId(user.getProject());
         PageHelper.startPage(param.getPage(), param.getPageSize());
         List<Orders> list = cereShopOrderDAO.getAll(param);
         if (!EmptyUtils.isEmpty(list)) {

cereshop-app/src/main/resources/mybatis/mapper/order/CereShopOrderDAO.xml

@@ -513,7 +513,6 @@
       LEFT JOIN cere_shop_comment sc ON sc.order_id = a.order_id
     </if>
     where a.buyer_user_id=#{buyerUserId}
-      and a.order_id>=(select order_id from cere_shop_order where buyer_user_id=#{buyerUserId} limit #{page},1)
     <if test="search!=null and search!=''">
       and (a.order_formid like concat('%',#{search},'%') OR
       f.product_name like concat('%',#{search},'%'))
@@ -521,6 +520,9 @@
     <if test="state!=null and state!=''">
       and a.state = #{state}
     </if>
+    <if test="businessId!=null and businessId!=''">
+      and a.project = #{businessId}
+    </if>
     GROUP BY a.order_id
     <if test="state != null and state == 4">
       HAVING op_count != sc_count