orderList, order add customer info

src/main/java/com.huiju.welcome/controller/TaGoodsOrdersController.java

@@ -2,23 +2,24 @@ package com.huiju.welcome.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaGoodsOrders;
 import com.huiju.welcome.model.TaGoodsOrdersDetail;
+import com.huiju.welcome.model.TdGoodsType;
 import com.huiju.welcome.service.ITaGoodsOrdersDetailService;
 import com.huiju.welcome.service.ITaGoodsOrdersService;
 import com.huiju.welcome.utils.StatusUtils;
 import com.huiju.welcome.utils.StringUtils;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -137,5 +138,22 @@ public class TaGoodsOrdersController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "商品订单列表", notes = "商品订单列表")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value = "/taGoodsOrders", method = RequestMethod.GET)
+    public ResponseBean goodsOrderList(@RequestParam(defaultValue = "1") int pageNum,
+                                 @RequestParam(defaultValue = "10") int pageSize,
+                                 @RequestParam(value = "userName",required = false) String userName,
+                                       @RequestParam(value = "userId",required = false) Integer userId,
+                                       @RequestParam(value = "ordersNo",required = false) String ordersNo,
+                                       @RequestParam(value = "customerId",required = true) Integer customerId) {
+        IPage<TaGoodsOrders> pg = new Page<>(pageNum, pageSize);
+
+        ResponseBean userManagement= iTaGoodsOrdersService.goodsOrderList(pg,userName,userId,ordersNo,customerId);
+
+        return userManagement;
+    }
+
 
 }

src/main/java/com.huiju.welcome/mapper/TaGoodsOrdersDetailMapper.java

@@ -2,8 +2,13 @@ package com.huiju.welcome.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.TaGoodsOrdersDetail;
+import com.huiju.welcome.model.TdGoodsType;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -16,4 +21,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaGoodsOrdersDetailMapper extends BaseMapper<TaGoodsOrdersDetail> {
 
+    /**
+     *
+     * @param orderId
+     * @return
+     */
+    List<TaGoodsOrdersDetail> detailList(@Param("orderId") Integer orderId);
 }

src/main/java/com.huiju.welcome/mapper/TaGoodsOrdersMapper.java

@@ -2,8 +2,11 @@ package com.huiju.welcome.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.TaGoodsOrders;
+import com.huiju.welcome.model.TdGoodsType;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,5 +18,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaGoodsOrdersMapper extends BaseMapper<TaGoodsOrders> {
+    /**
+     *
+     * @param pg
+     * @param userName
+     * @param userId
+     * @param ordersNo
+     * @return
+     */
+    IPage<TaGoodsOrders> goodsOrderList(IPage<TaGoodsOrders> pg, @Param("userName") String userName,@Param("userId")Integer userId,@Param("ordersNo")String ordersNo,@Param("customerId") Integer customerId);
 
 }

src/main/java/com.huiju.welcome/model/TaGoodsOrders.java

@@ -3,8 +3,10 @@ package com.huiju.welcome.model;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -46,9 +48,16 @@ public class TaGoodsOrders implements Serializable {
 
     private String userName;
 
+    private Integer customerId;
+
+    private String customerName;
+
     private Integer ordersNum;
 
     private String remark;
 
+    @TableField(exist = false)
+    private List<TaGoodsOrdersDetail> detailList;
+
 
 }

src/main/java/com.huiju.welcome/service/ITaGoodsOrdersService.java

@@ -1,8 +1,12 @@
 package com.huiju.welcome.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaGoodsOrders;
+import com.huiju.welcome.model.TdGoodsType;
+import io.swagger.models.auth.In;
 
 /**
  * <p>
@@ -14,4 +18,13 @@ import com.huiju.welcome.model.TaGoodsOrders;
  */
 public interface ITaGoodsOrdersService extends IService<TaGoodsOrders> {
 
+    /**
+     * 商品订单列表
+     * @param pg
+     * @param userName
+     * @param userId
+     * @param ordersNo
+     * @return
+     */
+    ResponseBean goodsOrderList(IPage<TaGoodsOrders> pg, String userName, Integer userId, String ordersNo, Integer customerId);
 }

src/main/java/com.huiju.welcome/service/impl/TaGoodsOrdersServiceImpl.java

@@ -1,12 +1,20 @@
 package com.huiju.welcome.service.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.mapper.TaGoodsOrdersDetailMapper;
 import com.huiju.welcome.mapper.TaGoodsOrdersMapper;
 import com.huiju.welcome.model.TaGoodsOrders;
+import com.huiju.welcome.model.TaGoodsOrdersDetail;
 import com.huiju.welcome.service.ITaGoodsOrdersService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,5 +25,32 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaGoodsOrdersServiceImpl extends ServiceImpl<TaGoodsOrdersMapper, TaGoodsOrders> implements ITaGoodsOrdersService {
+    @Autowired
+    private TaGoodsOrdersMapper taGoodsOrdersMapper;
+    @Autowired
+    private TaGoodsOrdersDetailMapper taGoodsOrdersDetailMapper;
+
+    @Override
+    public ResponseBean goodsOrderList(IPage<TaGoodsOrders> pg, String userName,Integer userId,String ordersNo,Integer customerId) {
+        ResponseBean responseBean= new ResponseBean();
+        IPage<TaGoodsOrders> list= taGoodsOrdersMapper.goodsOrderList(pg,userName,userId,ordersNo,customerId);
+        List<Integer> orderIds = new ArrayList<>();
+        List<TaGoodsOrders> orders = list.getRecords();
+        for(int i = 0;i<orders.size();i++){
+            orderIds.add(orders.get(i).getOrdersId());
+        }
+        List<TaGoodsOrdersDetail>detailList = taGoodsOrdersDetailMapper.selectBatchIds(orderIds);
+        for (int j = 0;j<orders.size();j++){
+            List<TaGoodsOrdersDetail>thisDetail = new ArrayList<>();
+            for(int h = 0; h<detailList.size();h++){
+                if(orders.get(j).getOrdersId() == detailList.get(h).getOrdersId()){
+                    thisDetail.add(detailList.get(h));
+                }
+            }
+            orders.get(j).setDetailList(thisDetail);
+        }
+        responseBean.addSuccess(list);
+        return responseBean;
+    }
 
 }

src/main/resources/mapper/TaGoodsOrdersDetailMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.welcome.mapper.TaGoodsOrdersDetailMapper">
+    <select id="detailList" resultType="com.huiju.welcome.model.TaGoodsOrdersDetail">
+        select
+        *
+        from ta_goods_orders_detail
+        where order_id = #{orderId}
+    </select>
+
+</mapper>

src/main/resources/mapper/TaGoodsOrdersMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.welcome.mapper.TaGoodsOrdersMapper">
+    <select id="goodsOrderList" resultType="com.huiju.welcome.model.TaGoodsOrders">
+        select
+         *
+        from ta_goods_orders
+        <where>
+            status > 0
+            <if test="userName !=null and userName !=''">
+                and user_name LIKE CONCAT('%',#{userName},'%')
+            </if>
+            <if test="userId !=null and userId !=''">
+                and user_id = #{userId}
+            </if>
+            <if test="ordersNo !=null and ordersNo !=''">
+                and orders_no LIKE = #{ordersNo}
+            </if>
+            <if test="customerId !=null and customerId !=''">
+                and customer_id LIKE = #{customerId}
+            </if>
+        </where>
+    </select>
+
+</mapper>