Merge branch 'feat-1002550' into 'master'

1002550客服介入回复语占位符替代用户输入内容

See merge request rays/pcloud-book!535

pcloud-service-book/src/main/java/com/pcloud/book/custom/biz/CustomPlanBiz.java

 package com.pcloud.book.custom.biz;
 
 import com.pcloud.book.custom.entity.CustomPlan;
+import com.pcloud.book.custom.vo.AddBookNameVO;
 import com.pcloud.book.custom.vo.AddCustomPlan4UserVO;
 import com.pcloud.book.custom.vo.AddSuggestionVO;
 import com.pcloud.book.custom.vo.CustomPlanModuleVO;
@@ -47,4 +48,8 @@ public interface CustomPlanBiz {
     public Boolean getUserInputPermission(String userWxId, Integer planId);
 
     List<Integer> getPlanIdListByUser(String wxId);
+
+    Integer addBookNameAndServiceType(AddBookNameVO addBookNameVO);
+
+    AddBookNameVO getUserBookAdnServiceType(String wxId, String robotWxId, Integer type);
 }

pcloud-service-book/src/main/java/com/pcloud/book/custom/biz/impl/CustomPlanBizImpl.java

@@ -17,6 +17,7 @@ import com.pcloud.book.custom.enums.PlanUseStateEnum;
 import com.pcloud.book.custom.mapper.CustomPlanMapper;
 import com.pcloud.book.custom.mapper.CustomPlanModuleMapper;
 import com.pcloud.book.custom.mapper.CustomPlanModuleSuggestionMapper;
+import com.pcloud.book.custom.vo.AddBookNameVO;
 import com.pcloud.book.custom.vo.AddCustomPlan4UserVO;
 import com.pcloud.book.custom.vo.AddSuggestionListVO;
 import com.pcloud.book.custom.vo.AddSuggestionVO;
@@ -388,4 +389,14 @@ public class CustomPlanBizImpl implements CustomPlanBiz {
     public List<Integer> getPlanIdListByUser(String wxId){
         return customPlanModuleSuggestionMapper.getPlanIdListByUser(wxId);
     }
+
+    @Override
+    public Integer addBookNameAndServiceType(AddBookNameVO addBookNameVO) {
+        return customPlanModuleSuggestionMapper.addBookNameAndServiceType(addBookNameVO);
+    }
+
+    @Override
+    public AddBookNameVO getUserBookAdnServiceType(String wxId, String robotWxId, Integer type) {
+        return customPlanModuleSuggestionMapper.getUserBookAdnServiceType(wxId, robotWxId, type);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/custom/facade/CustomPlanFacade.java

@@ -4,6 +4,7 @@ import com.pcloud.book.custom.biz.CustomPlanBiz;
 import com.pcloud.book.custom.biz.CustomPlanEmailBiz;
 import com.pcloud.book.custom.dto.CustomPlanEmailDto;
 import com.pcloud.book.custom.entity.CustomPlan;
+import com.pcloud.book.custom.vo.AddBookNameVO;
 import com.pcloud.book.custom.vo.AddCustomPlan4UserVO;
 import com.pcloud.book.custom.vo.AddSuggestionVO;
 import com.pcloud.book.custom.vo.EditCustomPlanModuleVO;
@@ -11,9 +12,9 @@ import com.pcloud.book.custom.vo.ModuleSuggestionVO;
 import com.pcloud.book.custom.vo.SuggestionListVO;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
+import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.SessionUtil;
-import com.pcloud.common.page.PageBeanNew;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -174,4 +175,17 @@ public class CustomPlanFacade {
         map.put("canInput", canInput);
         return new ResponseDto<>(map);
     }
+    @ApiOperation(value = "提交需求定制单-埋点书籍以及serviceType", httpMethod = "POST")
+    @PostMapping("addBookNameAndServiceType")
+    ResponseDto<?> addBookNameAndServiceType(@RequestBody AddBookNameVO addBookNameVO){
+        Integer id = customPlanBiz.addBookNameAndServiceType(addBookNameVO);
+        return new ResponseDto<>(id);
+    }
+
+    @ApiOperation(value = "获取用户埋点书名以及类型", httpMethod = "GET")
+    @GetMapping("getUserBookAdnServiceType")
+    ResponseDto<?> getUserBookAdnServiceType(@RequestParam("wxId") String wxId, @RequestParam("robotWxId") String robotWxId, @RequestParam("type") Integer type){
+        return new ResponseDto<>(customPlanBiz.getUserBookAdnServiceType(wxId, robotWxId, type));
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/custom/mapper/CustomPlanModuleSuggestionMapper.java

@@ -2,6 +2,7 @@ package com.pcloud.book.custom.mapper;
 
 
 import com.pcloud.book.custom.entity.CustomPlanModuleSuggestion;
+import com.pcloud.book.custom.vo.AddBookNameVO;
 import com.pcloud.book.custom.vo.AddCustomPlan4UserVO;
 import com.pcloud.book.custom.vo.ModuleSuggestionVO;
 import com.pcloud.book.custom.vo.SuggestionListVO;
@@ -31,4 +32,8 @@ public interface CustomPlanModuleSuggestionMapper {
     Integer getLatestPlanId(String wxId);
 
     List<Integer> getPlanIdListByUser(@Param("wxId") String wxId);
+
+    Integer addBookNameAndServiceType(AddBookNameVO addBookNameVO);
+
+    AddBookNameVO getUserBookAdnServiceType(@Param("wxId") String wxId, @Param("robotWxId") String robotWxId, @Param("type") Integer type);
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/custom/vo/AddBookNameVO.java

+package com.pcloud.book.custom.vo;
+
+import lombok.Data;
+
+@Data
+public class AddBookNameVO {
+
+    private String wxId;
+
+    private String bookName;
+
+    private String serviceType;
+
+    private String robotWxId;
+
+}

pcloud-service-book/src/main/resources/mapper/custom/CustomPlanModuleSuggestionMapper.xml

@@ -103,4 +103,30 @@
         FROM custom_plan_module_suggestion
         WHERE wx_id = #{wxId}
     </select>
+
+    <insert id="addBookNameAndServiceType" parameterType="com.pcloud.book.custom.vo.AddBookNameVO">
+        insert into user_book_service(wx_id, robot_wx_id, book_name, service_type, create_time)
+        values(#{wxId}, #{robotWxId}, #{bookName}, #{serviceType}, now())
+    </insert>
+
+    <select id="getUserBookAdnServiceType" resultType="com.pcloud.book.custom.vo.AddBookNameVO">
+        SELECT
+            wx_id wxId,
+            robot_wx_id robotWxId,
+            book_name bookName,
+            service_type serviceType
+        FROM
+            user_book_service
+        WHERE
+            wx_id = #{wxId}
+        AND robot_wx_id = #{robotWxId}
+        <if test="type == 1">
+            and book_name is not null
+        </if>
+        <if test="type == 2">
+            and service_type is not null
+        </if>
+        order by create_time desc
+        limit 1
+    </select>
 </mapper>
\ No newline at end of file