订单增加销售记录

mec-biz/src/main/java/com/ym/mec/biz/dal/page/SellOrderQueryInfo.java

@@ -0,0 +1,76 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.biz.dal.enums.SellTypeEnum;
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+public class SellOrderQueryInfo extends QueryInfo {
+
+    private String organIdList;
+
+    @ApiModelProperty(value = "商品名称",required = false)
+    private String goodsName;
+
+    @ApiModelProperty(value = "学校id",required = false)
+    private Integer schoolId;
+
+    @ApiModelProperty(value = "销售类型",required = false)
+    private SellTypeEnum type;
+
+    @ApiModelProperty(value = "开始时间",required = false)
+    private Date startTime;
+
+    @ApiModelProperty(value = "结束时间",required = false)
+    private Date endTime;
+
+
+    public String getOrganIdList() {
+        return organIdList;
+    }
+
+    public void setOrganIdList(String organIdList) {
+        this.organIdList = organIdList;
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public Integer getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Integer schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public SellTypeEnum getType() {
+        return type;
+    }
+
+    public void setType(SellTypeEnum type) {
+        this.type = type;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/SellOrderService.java

@@ -0,0 +1,10 @@
+package com.ym.mec.biz.service;
+
+
+import com.ym.mec.biz.dal.entity.SellOrder;
+import com.ym.mec.common.service.BaseService;
+
+
+public interface SellOrderService extends BaseService<Integer, SellOrder> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SellOrderServiceImpl.java

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+
+import com.ym.mec.biz.dal.dao.SellOrderDao;
+import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.service.*;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> implements SellOrderService {
+    @Autowired
+    private SellOrderDao sellOrderDao;
+
+    @Override
+    public BaseDAO<Integer, SellOrder> getDAO() {
+        return sellOrderDao;
+    }
+
+
+}

mec-biz/src/main/resources/config/mybatis/SellOrderMapper.xml

@@ -135,4 +135,47 @@
             #{sellOrder.paymentChannel},#{sellOrder.merNo},#{sellOrder.sellTime},#{sellOrder.createIme},#{sellOrder.updateTime}
         </foreach>
     </insert>
+
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="SellOrder" parameterType="map">
+        SELECT * FROM sell_order so
+        LEFT JOIN sys_user su ON so.user_id_ = su.id_
+        LEFT JOIN organization o ON o.id_ = so.organ_id_
+        <include refid="queryPageSql"/>
+        ORDER BY so.sell_time_ DESC
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
+        SELECT COUNT(*) FROM sell_order so
+        <include refid="queryPageSql"/>
+    </select>
+
+    <sql id="queryPageSql">
+        <where>
+            <if test="search != null and search != ''">
+                AND (so.order_no_ = #{search} OR so.trans_no_ = #{search})
+            </if>
+            <if test="organIdList != null and organIdList != ''">
+                AND FIND_IN_SET(so.organ_id_,#{organIdList})
+            </if>
+            <if test="goodsName != null and goodsName != ''">
+                AND so.goods_name_ = #{goodsName}
+            </if>
+            <if test="schoolId != null">
+                AND so.school_id_ = #{schoolId}
+            </if>
+            <if test="type != null">
+                AND so.type_ = #{type}
+            </if>
+            <if test="startTime != null">
+                AND so.sell_time_ >= #{startTime}
+            </if>
+            <if test="endTime != null">
+                AND so.sell_time_ &lt;= #{endTime}
+            </if>
+        </where>
+    </sql>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/SellOrderController.java

@@ -0,0 +1,70 @@
+package com.ym.mec.web.controller;
+
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.entity.SellOrder;
+import com.ym.mec.biz.dal.page.RepairStudentQueryInfo;
+import com.ym.mec.biz.dal.page.SellOrderQueryInfo;
+import com.ym.mec.biz.service.SellOrderService;
+import com.ym.mec.biz.service.StudentRepairService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.util.date.DateUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.snaker.engine.access.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+@RequestMapping("sellOrder")
+@Api(tags = "销售列表")
+@RestController
+public class SellOrderController extends BaseController {
+
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private SellOrderService sellOrderService;
+    @Autowired
+    private EmployeeDao employeeDao;
+
+    @ApiOperation("获取维修列表")
+    @GetMapping(value = "/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('sellOrder/queryPage')")
+    public HttpResponseResult<PageInfo<SellOrder>> queryPage(SellOrderQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (!sysUser.getIsSuperAdmin()) {
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (StringUtils.isEmpty(queryInfo.getOrganIdList())) {
+                queryInfo.setOrganIdList(employee.getOrganIdList());
+            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+                return failed("用户所在分部异常");
+            } else {
+                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+                if (!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))) {
+                    return failed("非法请求");
+                }
+            }
+        }
+        if (queryInfo.getEndTime() != null) {
+            queryInfo.setEndTime(DateUtil.getLastTimeWithDay(queryInfo.getEndTime()));
+        }
+        return succeed(sellOrderService.queryPage(queryInfo));
+    }
+}