Merge remote-tracking branch 'origin/master'

jiangping

2024-07-17 3a355771834c39d38a628132031ce1c52bc64478

 server/web/src/main/java/com/doumee/api/web/CustomerApi.java

@@ -11,10 +11,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.CustomerLog;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.business.model.Users;
import com.doumee.dao.business.model.*;
import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.dao.web.response.BjParamConfigResponse;
@@ -33,6 +30,7 @@
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.beans.Customizer;
import java.io.InputStream;
import java.util.List;

@@ -48,9 +46,6 @@
@RequestMapping("/web/customer")
@Slf4j
public class CustomerApi extends ApiController{




    @Autowired
    private MemberService memberService;
@@ -74,11 +69,18 @@

    @Autowired
    private CustomerUserService customerUserService;

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Autowired
    private CustomerLogService customerLogService;

    @Autowired
    private NewsService newsService;

    @Autowired
    private ActionsService actionsService;

    @ApiOperation(value = "客户端小程序登陆", notes = "客户端小程序")
    @GetMapping("/wxLoginCustomer")
@@ -187,7 +189,7 @@
        return  ApiResponse.success("操作成功");
    }

    @LoginRequired
   /* @LoginRequired
    @ApiOperation(value = "测试装修风格", notes = "客户端小程序")
    @PostMapping("/saveTestTrimStyle")
    @ApiImplicitParams({
@@ -196,15 +198,15 @@
    public ApiResponse saveTestTrimStyle(@RequestBody TestTrimStyleDTO testTrimStyleDTO) {
        testTrimStyleDTO.setMemberId(getMemberId());
        CustomerLog customerLog = customerService.saveTestTrimStyle(testTrimStyleDTO);
//        zbomCRMService.dealCustomerLogData(customerLog);
        zbomCRMService.dealCustomerLogData(customerLog);
        return  ApiResponse.success("操作成功");
    }
    }*/

    @LoginRequired
    @ApiOperation(value = "用户注销", notes = "客户端小程序")
    @GetMapping("/logOff")
    public ApiResponse logOff() {
        memberService.logOff(getMemberId());
        getZhongTaiDataService.userLogout(memberService.logOff(getMemberId()));
        return  ApiResponse.success("操作成功");
    }

@@ -400,4 +402,66 @@
    }


    @LoginRequired
    @ApiOperation(value = "定制服务列表", notes = "客户端小程序")
    @GetMapping("/getCustomizedNewsList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<List<News>> getCustomizedNewsList() {
        return ApiResponse.success("查询成功",newsService.getCustomizedNewsList(Constants.ONE,null,null));
    }


    @LoginRequired
    @ApiOperation(value = "定制服务详情", notes = "客户端小程序")
    @GetMapping("/getCustomizedNewsDetail")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Long", name = "id", value = "业务数据主键", required = true),
    })
    public ApiResponse<News> getCustomizedNewsDetail(@RequestParam Long id) {
        return ApiResponse.success("查询成功",newsService.getCustomizedNewsDetail(id));
    }

    @LoginRequired
    @ApiOperation(value = "保存推广咨询分享记录", notes = "客户端小程序")
    @GetMapping("/saveShareRecord")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Long", name = "id", value = "推广咨询主键", required = true),
    })
    public ApiResponse saveShareRecord(@RequestParam Long id) {
        newsService.saveShareRecord(id,getMemberId());
        return ApiResponse.success("操作成功");
    }

    @LoginRequired
    @ApiOperation(value = "我的喜欢列表", notes = "客户端小程序")
    @PostMapping("/getZhongTaiCusFavorite")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<ZTBasePageResponse<ZTCusFavoritesInfoResponse>> getZhongTaiCusFavorite(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(Constants.CUSTOMER);
        ZTBasePageResponse<ZTCusFavoritesInfoResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCusFavorite(ztContentListRequest);
        return ApiResponse.success("获取成功",ztBasePageResponse);
    }



    @LoginRequired
    @ApiOperation(value = "轮播图列表", notes = "客户端小程序")
    @PostMapping("/getZhongTaiCarouselImage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<ZTBasePageResponse<ZTCusCarouselImageResponse>> getZhongTaiCarouselImage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(Constants.CUSTOMER);
        ZTBasePageResponse<ZTCusCarouselImageResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCarouselImage(ztContentListRequest);
        return ApiResponse.success("获取成功",ztBasePageResponse);
    }

}