logic delete

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

@@ -14,6 +14,8 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -36,6 +38,9 @@ import java.util.Map;
 @RestController
 @RequestMapping("/")
 public class SysUserController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdSpecController.class);
+
     @Autowired
     private ISysUserService sysUserService;
 
@@ -331,9 +336,22 @@ public class SysUserController extends BaseController {
     }
 
     @ApiOperation(value = "當前員工離職", notes = "當前員工離職")
-    @RequestMapping(value = "/fireUser", method = RequestMethod.PUT)
-    public ResponseBean fireUser(@RequestParam(value = "userId",required = false) Integer userId) {
-        ResponseBean fireUser= sysUserService.fireUser(userId);
-        return fireUser;
+    @RequestMapping(value = "/fireUser/{id}", method = RequestMethod.PUT)
+    public ResponseBean fireUser(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try{
+            SysUser sysUser = sysUserService.getById(id);
+            sysUser.setStatus(StatusUtils.Delete);
+            sysUser.setInService(0);
+            if (sysUserService.updateById(sysUser)){
+                responseBean.addSuccess(sysUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdSpecDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
     }
 }

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

@@ -97,7 +97,9 @@ public class TaGoodsController extends BaseController {
     public ResponseBean taGoodsDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaGoodsService.removeById(id)){
+            TaGoods taGoods = iTaGoodsService.getById(id);
+            taGoods.setStatus(StatusUtils.Delete);
+            if(iTaGoodsService.updateById(taGoods)){
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
@@ -150,7 +152,9 @@ public class TaGoodsController extends BaseController {
     public ResponseBean tpShopImgGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaGoodsService.getById(id));
+            TaGoods taGoods = iTaGoodsService.getById(id);
+            taGoods.setSpecList(iTaGoodsSpecService.specListByGoodsId(id));
+            responseBean.addSuccess(taGoods);
         }catch (Exception e){
             logger.error("taGoodsDelete -=- {}",e.toString());
             responseBean.addError(e.getMessage());

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

@@ -70,7 +70,9 @@ public class TdGoodsTypeController extends BaseController {
     public ResponseBean tdGoodsTypeDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTdGoodsTypeService.removeById(id)){
+            TdGoodsType tdGoodsType = iTdGoodsTypeService.getById(id);
+            tdGoodsType.setStatus(StatusUtils.Delete);
+            if(iTdGoodsTypeService.updateById(tdGoodsType)){
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");

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

@@ -64,11 +64,13 @@ public class TdSpecController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/tdSpec/delete/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/tdSpec/delete/{id}", method= RequestMethod.PUT)
     public ResponseBean tdSpecDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTdSpecService.removeById(id)){
+            TdSpec tdSpec = iTdSpecService.getById(id);
+            tdSpec.setStatus(StatusUtils.Delete);
+            if(iTdSpecService.updateById(tdSpec)){
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");

src/main/java/com.huiju.welcome/mapper/TaGoodsSpecMapper.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.TaGoodsSpec;
+import com.huiju.welcome.model.TdGoodsType;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,5 +20,18 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaGoodsSpecMapper extends BaseMapper<TaGoodsSpec> {
+    /**
+     *
+     * @param pg
+     * @param specName
+     * @return
+     */
+    IPage<TaGoodsSpec> specGoodsList(IPage<TaGoodsSpec> pg, @Param("specName") String specName);
 
+    /**
+     *
+     * @param goodsId
+     * @return
+     */
+    List<TaGoodsSpec> specListByGoodsId(@Param("goodsId") Integer goodsId);
 }

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

@@ -1,8 +1,13 @@
 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.TaGoodsSpec;
+import com.huiju.welcome.model.TdGoodsType;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,4 +19,16 @@ import com.huiju.welcome.model.TaGoodsSpec;
  */
 public interface ITaGoodsSpecService extends IService<TaGoodsSpec> {
 
+    /**
+     * @param pg
+     * @param specName
+     * @return
+     */
+    ResponseBean specGoodsList(IPage<TaGoodsSpec> pg, String specName);
+
+    /**
+     * @param goodsId
+     * @return
+     */
+    List<TaGoodsSpec> specListByGoodsId(Integer goodsId);
 }

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

@@ -3,8 +3,10 @@ package com.huiju.welcome.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.mapper.TaGoodsImgMapper;
+import com.huiju.welcome.mapper.TaGoodsSpecMapper;
 import com.huiju.welcome.model.TaGoodsImg;
 import com.huiju.welcome.service.ITaGoodsImgService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -18,4 +20,6 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaGoodsImgServiceImpl extends ServiceImpl<TaGoodsImgMapper, TaGoodsImg> implements ITaGoodsImgService {
 
+
+
 }

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

@@ -1,12 +1,17 @@
 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.TaGoodsSpecMapper;
 import com.huiju.welcome.model.TaGoodsSpec;
 import com.huiju.welcome.service.ITaGoodsSpecService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,5 +22,21 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaGoodsSpecServiceImpl extends ServiceImpl<TaGoodsSpecMapper, TaGoodsSpec> implements ITaGoodsSpecService {
+    @Autowired
+    private TaGoodsSpecMapper taGoodsSpecMapper;
+
+    @Override
+    public ResponseBean specGoodsList(IPage<TaGoodsSpec> pg, String specName) {
+        ResponseBean responseBean= new ResponseBean();
+        IPage<TaGoodsSpec> list= taGoodsSpecMapper.specGoodsList(pg,specName);
+        responseBean.addSuccess(list);
+        return responseBean;
+    }
+
+    @Override
+    public List<TaGoodsSpec> specListByGoodsId( Integer goodsId) {
+        List<TaGoodsSpec> list= taGoodsSpecMapper.specListByGoodsId(goodsId);
+        return list;
+    }
 
 }

src/main/resources/mapper/TaGoodsMapper.xml

@@ -15,7 +15,7 @@
                 and g.goods_name LIKE CONCAT('%',#{goodsName},'%')
             </if>
             <if test="typeId !=null and typeId !=''">
-                and g.type_id = CONCAT('%',#{typeId},'%')
+                and g.type_id = #{typeId}
             </if>
         </where>
     </select>

src/main/resources/mapper/TaGoodsSpecMapper.xml

@@ -1,7 +1,7 @@
 <?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.TaGoodsSpecMapper">
-    <select id="specList" resultType="com.huiju.welcome.model.TaGoodsSpec">
+    <select id="specGoodsList" resultType="com.huiju.welcome.model.TaGoodsSpec">
         select
         a.*,
         b.spec_name as specName
@@ -9,7 +9,7 @@
         left join td_spec b on a.spec_id = b.spec_id
         <where>
             <if test="specName !=null and specName !=''">
-                spec_name LIKE CONCAT('%',#{specName},'%')
+                b.spec_name LIKE CONCAT('%',#{specName},'%')
             </if>
         </where>
     </select>
@@ -20,11 +20,7 @@
         b.spec_name as specName
         from ta_goods_spec a
         left join td_spec b on a.spec_id = b.spec_id
-        <where>
-            <if test="specName !=null and specName !=''">
-                spec_name LIKE CONCAT('%',#{specName},'%')
-            </if>
-        </where>
+        where a.goods_id = #{goodsId}
     </select>
 
 </mapper>