新增供应商查看订单

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/OmsOrderQueryParam.java

@@ -34,4 +34,6 @@ public class OmsOrderQueryParam {
     @ApiModelProperty(value = "结束时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
+
+    private Long compId;
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/OmsOrderServiceImpl.java

@@ -12,6 +12,7 @@ import com.hwrj.cloud.admin.mapper.OmsOrderOperateHistoryMapper;
 import com.hwrj.cloud.admin.mapper.PmsProductMapper;
 import com.hwrj.cloud.admin.model.*;
 import com.hwrj.cloud.admin.service.OmsOrderService;
+import com.hwrj.cloud.admin.util.CurrUserUtil;
 import com.hwrj.cloud.common.exception.GlobalException;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
@@ -41,6 +42,10 @@ public class OmsOrderServiceImpl implements OmsOrderService {
 
     @Override
     public List<OmsOrder> list(OmsOrderQueryParam queryParam, Integer pageSize, Integer pageNum) {
+        long compId = CurrUserUtil.getCompId();
+        if(!StringUtils.isEmpty(compId)){
+            queryParam.setCompId(compId);
+        }
         PageHelper.startPage(pageNum, pageSize);
         return orderDao.getList(queryParam);
     }

forest-admin/admin-server/src/main/resources/dao/OmsOrderDao.xml

@@ -6,36 +6,42 @@
         <collection property="historyList" resultMap="com.hwrj.cloud.admin.mapper.OmsOrderOperateHistoryMapper.BaseResultMap" columnPrefix="history_"/>
     </resultMap>
     <select id="getList" resultMap="com.hwrj.cloud.admin.mapper.OmsOrderMapper.BaseResultMap">
-        SELECT *
+        SELECT
+        a.*
         FROM
-        oms_order
+        oms_order a
+        JOIN oms_order_item b ON b.order_id=a.id
+        JOIN pms_product c ON c.id = b.product_id
         WHERE
-        delete_status = 0
+        a.delete_status = 0
+        <if test="queryParam.compId!=null and queryParam.compId!=''">
+            AND c.comp_id = #{queryParam.compId}
+        </if>
         <if test="queryParam.orderSn!=null and queryParam.orderSn!=''">
-            AND order_sn = #{queryParam.orderSn}
+            AND a.order_sn = #{queryParam.orderSn}
         </if>
         <if test="queryParam.status!=null">
-            AND `status` = #{queryParam.status}
+            AND a.`status` = #{queryParam.status}
         </if>
         <if test="queryParam.sourceType!=null">
-            AND source_type = #{queryParam.sourceType}
+            AND a.source_type = #{queryParam.sourceType}
         </if>
         <if test="queryParam.orderType!=null">
-            AND order_type = #{queryParam.orderType}
+            AND a.order_type = #{queryParam.orderType}
         </if>
         <if test="queryParam.startTime!=null">
-            AND create_time <![CDATA[>=]]> #{queryParam.startTime}
+            AND a.create_time <![CDATA[>=]]> #{queryParam.startTime}
         </if>
         <if test="queryParam.endTime!=null">
-            AND create_time <![CDATA[<=]]> #{queryParam.endTime}
+            AND a.create_time <![CDATA[<=]]> #{queryParam.endTime}
         </if>
         <if test="queryParam.receiverKeyword!=null and queryParam.receiverKeyword!=''">
             AND (
-            receiver_name LIKE concat("%",#{queryParam.receiverKeyword},"%")
-            OR receiver_phone LIKE concat("%",#{queryParam.receiverKeyword},"%")
+            a.receiver_name LIKE concat("%",#{queryParam.receiverKeyword},"%")
+            OR a.receiver_phone LIKE concat("%",#{queryParam.receiverKeyword},"%")
             )
         </if>
-        order by id desc
+        order by a.id desc
     </select>
     <update id="delivery">
         UPDATE oms_order