xuq

src/main/java/com/gree/mall/manager/commonmapper/OrderMapper.java

@@ -17,7 +17,8 @@ public interface OrderMapper {
             @Param("phone")String phone,  @Param("exchangeCode")String exchangeCode,  @Param("orderStatus")String orderStatus,
             @Param("startCreateTime")String startCreateTime,  @Param("endCreateTime")String endCreateTime,
             @Param("startPayTime")String startPayTime,  @Param("endPayTime")String endPayTime,  @Param("promotionGroupUserName")String promotionGroupUserName,
-            @Param("promotionGroupId")String promotionGroupId,@Param("promotionGroupUserId") String promotionGroupUserId,@Param("websitId") String websitId,
+            @Param("promotionGroupId")String promotionGroupId,@Param("promotionGroupUserId") String promotionGroupUserId,
+            @Param("websitId") String websitId,
             @Param("goodsId") String goodsId,
             @Param("companyIds") List<String> companyIds,@Param("websitIds") List<String> websitIds
     );

src/main/java/com/gree/mall/manager/logic/order/OrderLogic.java

@@ -587,7 +587,7 @@ public class OrderLogic {
         String companyName = expressLogic.expressCompanyName(companyCode);
         orderInfo.setLogisticsNo(logisticsNo);
         orderInfo.setCompanyCode(companyCode);
-        orderInfo.setCompanyName(companyName);
+        orderInfo.setPickCompanyName(companyName);
         orderInfo.setOrderStatus(OrderStatusEnum.YFH.toString());
         orderInfo.setStorageName(detail.getStorageName());
         orderInfo.setStorageAddress(detail.getStorageAddress());
@@ -933,7 +933,7 @@ public class OrderLogic {
         List<OrderDetailListBean> orderDetailListBeanList = orderMapper.selectByQueryMsg(userId, orderId, productName, userName,
                 phone, exchangeCode, orderStatus,
                 startCreateTime, endCreateTime,
-                startPayTime, endPayTime, promotionGroupUserName, promotionGroupId, promotionGroupUserId, websitId, goodsId, adminUser.getAdminCompanyIds(), null);
+                startPayTime, endPayTime, promotionGroupUserName, promotionGroupId, promotionGroupUserId, websitId, goodsId, adminUser.getAdminCompanyIds(), adminUser.getAdminWebsitIds());
 
         List<List<Object>> rows = new ArrayList<>();
         for (OrderDetailListBean orderDetailListBean : orderDetailListBeanList) {

src/main/resources/mapper/OrderMapper.xml

@@ -101,9 +101,9 @@
             <if test="goodsId != null and goodsId !=''">
                 and o.promotion_package_goods_id = #{goodsId}
             </if>
-            <if test="companyWechatIds != null and companyWechatIds.size > 0">
+            <if test="companyIds != null and companyIds.size > 0">
                 and o.company_id in
-                <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
+                <foreach item="item" index="index" collection="companyIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>