feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.shigongli</groupId>
 	<artifactId>shigongli</artifactId>
-	<version>1.0.3</version>
+	<version>1.0.5</version>
 	<name>shigongli</name>
 	<description>ShiGongli Service</description>
 

src/main/java/com/shigongli/controller/TaHouseController.java

@@ -11,6 +11,7 @@ import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.TaPerson;
 import com.shigongli.entity.TaShop;
 import com.shigongli.entity.TaShopKeeper;
+import com.shigongli.service.ITaHouseSurroundService;
 import com.shigongli.service.ITaShopKeeperService;
 import com.shigongli.service.ITaShopService;
 import io.swagger.annotations.Api;
@@ -25,6 +26,7 @@ import com.shigongli.service.ITaHouseService;
 import com.shigongli.entity.TaHouse;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -57,6 +59,9 @@ public class TaHouseController extends BaseController {
     @Autowired
     ITaShopService iTaShopService;
 
+    @Autowired
+    ITaHouseSurroundService iTaHouseSurroundService;
+
     @Autowired
     ScreenShotUtil screenShotUtil;
 
@@ -91,6 +96,7 @@ public class TaHouseController extends BaseController {
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean houseList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                   @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                  @ApiParam("商铺ID") @RequestParam(value ="shopId", required = false) String shopId,
                                   HttpServletRequest request) throws Exception{
 
         TaPerson taPerson = getPerson(request);
@@ -99,7 +105,7 @@ public class TaHouseController extends BaseController {
         }
 
         IPage<TaHouse> pg = new Page<>(pageNum, pageSize);
-        IPage<TaHouse> result = iTaHouseService.getHousesOfKeeper(pg, taPerson);
+        IPage<TaHouse> result = iTaHouseService.getHousesOfKeeper(pg, taPerson, shopId);
         return ResponseBean.success(result);
     }
 
@@ -138,7 +144,19 @@ public class TaHouseController extends BaseController {
             taHouse.setShopId(shopKeeperList.get(0).getShopId());
         }
 
+        taHouse.setCreateDate(LocalDateTime.now());
+
+        // 复制房源
+        if (!StringUtils.isEmpty(taHouse.getOriginId())) {
+            taHouse.setTitle(String.format("%s(复制)", taHouse.getTitle() + ""));
+        }
+
         if (iTaHouseService.save(taHouse)){
+            // 复制房源
+            if (!StringUtils.isEmpty(taHouse.getOriginId())) {
+                iTaHouseSurroundService.copySurroundByHouse(taHouse.getOriginId(), taHouse.getHouseId());
+            }
+
             return ResponseBean.success(taHouse);
         } else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -199,9 +217,10 @@ public class TaHouseController extends BaseController {
      * 查询当前房源
      * @param id  实体ID
      */
-    @RequestMapping(value="/ma/taHouse/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/taHouse/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean houseDetail(@ApiParam("房源ID") @PathVariable String id) throws Exception{
+    public ResponseBean houseDetail(@ApiParam("客户端") @PathVariable String client,
+                                    @ApiParam("房源ID") @PathVariable String id) throws Exception{
         TaHouse taHouse = iTaHouseService.getById(id);
         TaShop taShop = iTaShopService.getById(taHouse.getShopId());
         taHouse.setTaShop(taShop);

src/main/java/com/shigongli/controller/TaShopController.java

@@ -113,7 +113,7 @@ public class TaShopController extends BaseController {
     @RequestMapping(value="/mp/taShop/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean taShopUpdate(@ApiParam("对象ID") @PathVariable String id,
-                                        @ApiParam("更新内容") @RequestBody TaShop taShop) throws Exception{
+                                     @ApiParam("更新内容") @RequestBody TaShop taShop) throws Exception{
         if (StringUtils.isEmpty(taShop.getName())) {
             return ResponseBean.error("名称不能为空", ResponseBean.ERROR_MISSING_PARAMS);
         }

src/main/java/com/shigongli/entity/TaHouse.java

@@ -82,4 +82,10 @@ public class TaHouse implements Serializable {
 
     @TableField(exist = false)
     private TaShop taShop;
+
+    /**
+     * 复制来源ID
+     */
+    @TableField(exist = false)
+    private String originId;
 }

src/main/java/com/shigongli/mapper/TaHouseMapper.java

@@ -17,5 +17,5 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TaHouseMapper extends BaseMapper<TaHouse> {
 
-    IPage<TaHouse> getHousesOfKeeper(IPage<TaHouse> pg, @Param("personId") String personId);
+    IPage<TaHouse> getHousesOfKeeper(IPage<TaHouse> pg, @Param("personId") String personId, @Param("shopId") String shopId);
 }

src/main/java/com/shigongli/mapper/TaHouseSurroundMapper.java

@@ -18,4 +18,6 @@ import org.apache.ibatis.annotations.Param;
 public interface TaHouseSurroundMapper extends BaseMapper<TaHouseSurround> {
 
     IPage<TaHouseSurround> getListByHouseOrNot(IPage<TaHouseSurround> pg, @Param("houseId") String houseId);
+
+    int copySurroundByHouse(@Param("fromHouse") String fromHouse,@Param("toHouse") String toHouse);
 }

src/main/java/com/shigongli/service/ITaHouseService.java

@@ -15,7 +15,7 @@ import com.shigongli.entity.TaPerson;
  */
 public interface ITaHouseService extends IService<TaHouse> {
 
-    IPage<TaHouse> getHousesOfKeeper(IPage<TaHouse> pg, TaPerson taPerson);
+    IPage<TaHouse> getHousesOfKeeper(IPage<TaHouse> pg, TaPerson taPerson, String shopId);
 
     boolean isOwner(String personId, String houseId);
 }

src/main/java/com/shigongli/service/ITaHouseSurroundService.java

@@ -15,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ITaHouseSurroundService extends IService<TaHouseSurround> {
 
     IPage<TaHouseSurround> getListByHouseOrNot(IPage<TaHouseSurround> pg, String houseId);
+
+    void copySurroundByHouse(String fromHouse, String toHouse);
 }

src/main/java/com/shigongli/service/impl/TaHouseServiceImpl.java

@@ -35,9 +35,9 @@ public class TaHouseServiceImpl extends ServiceImpl<TaHouseMapper, TaHouse> impl
     ITaShopKeeperService iTaShopKeeperService;
 
     @Override
-    public IPage<TaHouse> getHousesOfKeeper(IPage<TaHouse> pg, TaPerson taPerson) {
+    public IPage<TaHouse> getHousesOfKeeper(IPage<TaHouse> pg, TaPerson taPerson, String shopId) {
 
-        return taHouseMapper.getHousesOfKeeper(pg, taPerson.getPersonId());
+        return taHouseMapper.getHousesOfKeeper(pg, taPerson.getPersonId(), shopId);
     }
 
     @Override

src/main/java/com/shigongli/service/impl/TaHouseSurroundServiceImpl.java

@@ -25,4 +25,9 @@ public class TaHouseSurroundServiceImpl extends ServiceImpl<TaHouseSurroundMappe
     public IPage<TaHouseSurround> getListByHouseOrNot(IPage<TaHouseSurround> pg, String houseId) {
         return taHouseSurroundMapper.getListByHouseOrNot(pg, houseId);
     }
+
+    @Override
+    public void copySurroundByHouse(String fromHouse, String toHouse) {
+        taHouseSurroundMapper.copySurroundByHouse(fromHouse, toHouse);
+    }
 }

src/main/java/com/shigongli/service/impl/TaShopKeeperServiceImpl.java

@@ -63,7 +63,8 @@ public class TaShopKeeperServiceImpl extends ServiceImpl<TaShopKeeperMapper, TaS
 
         QueryWrapper<TaShopKeeper> queryWrapper = new QueryWrapper<TaShopKeeper>()
                 .eq("person_id", personId)
-                .eq("status", StatusConstant.NORMAL);
+                .eq("status", StatusConstant.NORMAL)
+                .orderByAsc("shop_id");
 
         List<TaShopKeeper> list = list(queryWrapper);
         if (null != list && list.size() > 0) {

src/main/resources/mapper/TaHouseMapper.xml

@@ -10,7 +10,11 @@
         INNER JOIN ta_shop_keeper s ON t.shop_id = s.shop_id
         WHERE
             s.person_id = #{personId}
+        <if test="null != shopId and '' != shopId">
+            AND s.shop_id = #{shopId}
+        </if>
             AND s.`status` = 1
             AND t.`status` = 1
+        ORDER BY t.title DESC
     </select>
 </mapper>

src/main/resources/mapper/TaHouseSurroundMapper.xml

@@ -1,6 +1,21 @@
 <?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.shigongli.mapper.TaHouseSurroundMapper">
+    <insert id="copySurroundByHouse">
+        INSERT INTO ta_house_surround ( surround_id, house_id, image_id, sort_no, `status`, create_date )
+            SELECT
+            UUID( ),
+            #{toHouse},
+            t.image_id,
+            t.sort_no,
+            t.`status`,
+            NOW( )
+        FROM
+            ta_house_surround t
+        WHERE
+            t.house_id = #{fromHouse}
+            AND t.`status` = 1
+    </insert>
 
     <select id="getListByHouseOrNot" resultType="com.shigongli.entity.TaHouseSurround">
         SELECT