Commit a02897e3 by huluobin

文档注释

parent a6b4628f
...@@ -33,10 +33,8 @@ public class OverTimeRecordController { ...@@ -33,10 +33,8 @@ public class OverTimeRecordController {
@RequestBody OrderTimeRecordPageQuery qry) { @RequestBody OrderTimeRecordPageQuery qry) {
Calendar cale = Calendar.getInstance(); Calendar cale = Calendar.getInstance();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
// 获取前月的第一天 // 获取前月的第一天
cale = Calendar.getInstance();
cale.add(Calendar.MONTH, 0); cale.add(Calendar.MONTH, 0);
cale.set(Calendar.DAY_OF_MONTH, 1); cale.set(Calendar.DAY_OF_MONTH, 1);
Date firstDay = cale.getTime(); Date firstDay = cale.getTime();
......
...@@ -28,7 +28,6 @@ public class TakeLeaveEventController { ...@@ -28,7 +28,6 @@ public class TakeLeaveEventController {
*/ */
private final TakeLeaveEventCmdService takeLeaveEventCmdService; private final TakeLeaveEventCmdService takeLeaveEventCmdService;
private final GogirlTokenService gogirlTokenService;
@ApiOperation("/申请请假") @ApiOperation("/申请请假")
......
...@@ -4,7 +4,6 @@ import com.gogirl.application.user.customer.CustomerService; ...@@ -4,7 +4,6 @@ import com.gogirl.application.user.customer.CustomerService;
import com.gogirl.domain.user.customer.Customer; import com.gogirl.domain.user.customer.Customer;
import com.gogirl.dto.customer.CustomerOrderDetail; import com.gogirl.dto.customer.CustomerOrderDetail;
import com.gogirl.infrastructure.common.base.JsonResult; import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.config.property.GogirlProperties;
import com.gogirl.infrastructure.service.file.FileService; import com.gogirl.infrastructure.service.file.FileService;
import com.gogirl.infrastructure.util.Base64Utils; import com.gogirl.infrastructure.util.Base64Utils;
import com.gogirl.shared.user.query.qry.CustomerQuery; import com.gogirl.shared.user.query.qry.CustomerQuery;
...@@ -26,10 +25,20 @@ public class CustomerController { ...@@ -26,10 +25,20 @@ public class CustomerController {
@Resource @Resource
private CustomerService customerService; private CustomerService customerService;
@Resource @Resource
private GogirlProperties gogirlProperties;
@Resource
FileService fileService; FileService fileService;
/*cmd 接口开始*/
/**
* <p>提交or更新用户街道地址信息</p>
*
* @param customerId 用户id
* @param province 省份
* @param city 城市
* @param area 地区
* @param street 街道
* @return
*/
@ApiOperation("用户授权接街道地址信息") @ApiOperation("用户授权接街道地址信息")
@GetMapping("/customer/xcx/bindAddressInfo") @GetMapping("/customer/xcx/bindAddressInfo")
public JsonResult<String> bindAddressInfo(@RequestParam Integer customerId, public JsonResult<String> bindAddressInfo(@RequestParam Integer customerId,
...@@ -41,6 +50,11 @@ public class CustomerController { ...@@ -41,6 +50,11 @@ public class CustomerController {
return JsonResult.success(); return JsonResult.success();
} }
/*cmd接口结束*/
/*query接口开始*/
/*query接口结束*/
@ApiOperation(("查询会员")) @ApiOperation(("查询会员"))
@PostMapping("/customer/xcx/query") @PostMapping("/customer/xcx/query")
public JsonResult<Customer> query(@RequestBody CustomerQuery qry) { public JsonResult<Customer> query(@RequestBody CustomerQuery qry) {
...@@ -48,7 +62,6 @@ public class CustomerController { ...@@ -48,7 +62,6 @@ public class CustomerController {
return JsonResult.success(customer); return JsonResult.success(customer);
} }
@ApiOperation(value = "客户根据code获取token") @ApiOperation(value = "客户根据code获取token")
@GetMapping("/customer/xcx/login") @GetMapping("/customer/xcx/login")
public JsonResult<String> login(@RequestParam String code) { public JsonResult<String> login(@RequestParam String code) {
......
...@@ -20,10 +20,9 @@ import org.springframework.web.bind.annotation.*; ...@@ -20,10 +20,9 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@AllArgsConstructor @AllArgsConstructor
@Api(tags = {"version2.0: 消息接口"}) @Api(tags = {"用户消息消息接口"})
@Slf4j @Slf4j
public class MessageController { public class MessageController {
private final GogirlTokenService gogirlTokenService; private final GogirlTokenService gogirlTokenService;
private final VisitLogService visitLogService; private final VisitLogService visitLogService;
...@@ -49,9 +48,6 @@ public class MessageController { ...@@ -49,9 +48,6 @@ public class MessageController {
@PostMapping("/customer/message/loginLog") @PostMapping("/customer/message/loginLog")
public JsonResult<Integer> loginLog(@RequestHeader String token) { public JsonResult<Integer> loginLog(@RequestHeader String token) {
GogirlToken gt = gogirlTokenService.getByToken(token); GogirlToken gt = gogirlTokenService.getByToken(token);
if (gt == null) {
throw new RRException(2000, "token失效");
}
VisitsLog visitsLog = visitLogService.loginLog(gt.getCustomerId()); VisitsLog visitsLog = visitLogService.loginLog(gt.getCustomerId());
return JsonResult.success(visitsLog.getId()); return JsonResult.success(visitsLog.getId());
} }
...@@ -69,7 +65,6 @@ public class MessageController { ...@@ -69,7 +65,6 @@ public class MessageController {
public JsonResult<Void> recordActivityId(@RequestHeader String token, public JsonResult<Void> recordActivityId(@RequestHeader String token,
@RequestParam Integer visitsId, @RequestParam Integer visitsId,
@RequestParam Integer activityId) { @RequestParam Integer activityId) {
visitLogService.recordActivityId(visitsId, activityId); visitLogService.recordActivityId(visitsId, activityId);
return JsonResult.success(); return JsonResult.success();
......
...@@ -9,9 +9,6 @@ spring: ...@@ -9,9 +9,6 @@ spring:
jackson: jackson:
date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8 time-zone: GMT+8
# redis:
# timeout: 0
#mybatis 配置 #mybatis 配置
mybatis: mybatis:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment