添加员工折扣
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
package com.chaozhanggui.system.cashierservice.controller;
|
||||
|
||||
import com.chaozhanggui.system.cashierservice.service.MemberService;
|
||||
import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
|
||||
import com.chaozhanggui.system.cashierservice.sign.Result;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Map;
|
||||
|
||||
@CrossOrigin(origins = "*")
|
||||
@@ -28,8 +28,8 @@ public class MemberController {
|
||||
@RequestParam("phone") String phone,
|
||||
@RequestParam("page") int page,
|
||||
@RequestParam("pageSize") int pageSize
|
||||
){
|
||||
return memberService.queryMember(shopId,phone,page,pageSize);
|
||||
) {
|
||||
return memberService.queryMember(shopId, phone, page, pageSize);
|
||||
}
|
||||
|
||||
|
||||
@@ -37,43 +37,46 @@ public class MemberController {
|
||||
public Result createMember(@RequestHeader("token") String token,
|
||||
@RequestHeader("loginName") String loginName,
|
||||
@RequestHeader("clientType") String clientType,
|
||||
@RequestBody Map<String,Object> map
|
||||
){
|
||||
@RequestBody Map<String, Object> map
|
||||
) {
|
||||
return memberService.createMember(map);
|
||||
}
|
||||
|
||||
|
||||
@RequestMapping("memberScanPay")
|
||||
public Result memberScanPay(
|
||||
@RequestHeader("token") String token,
|
||||
@RequestHeader("loginName") String loginName,
|
||||
@RequestHeader("clientType") String clientType,
|
||||
@RequestBody Map<String,Object> map
|
||||
@RequestHeader("token") String token,
|
||||
@RequestHeader("loginName") String loginName,
|
||||
@RequestHeader("clientType") String clientType,
|
||||
@RequestBody Map<String, Object> map
|
||||
|
||||
){
|
||||
return memberService.memberScanPay(map,token);
|
||||
) {
|
||||
return memberService.memberScanPay(map, token);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@GetMapping("queryScanPay")
|
||||
public Result queryScanPay(@RequestHeader("token") String token,
|
||||
@RequestHeader("loginName") String loginName,
|
||||
@RequestHeader("clientType") String clientType,
|
||||
@RequestParam("flowId") String flowId
|
||||
){
|
||||
return memberService.queryScanPay(flowId,token);
|
||||
) {
|
||||
return memberService.queryScanPay(flowId, token);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@RequestMapping("accountPay")
|
||||
public Result accountPay( @RequestHeader("token") String token,
|
||||
@RequestHeader("loginName") String loginName,
|
||||
@RequestHeader("clientType") String clientType,
|
||||
@RequestBody Map<String,Object> map
|
||||
){
|
||||
return memberService.memberAccountPay(map,token);
|
||||
public Result accountPay(@RequestHeader("token") String token,
|
||||
@RequestHeader("loginName") String loginName,
|
||||
@RequestHeader("clientType") String clientType,
|
||||
@RequestBody Map<String, Object> map
|
||||
) {
|
||||
try {
|
||||
return memberService.memberAccountPay(map, token);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return Result.fail(CodeEnum.SYS_EXCEPTION);
|
||||
}
|
||||
|
||||
|
||||
@@ -81,11 +84,22 @@ public class MemberController {
|
||||
public Result queryMemberAccount(@RequestHeader("token") String token,
|
||||
@RequestHeader("loginName") String loginName,
|
||||
@RequestHeader("clientType") String clientType,
|
||||
@RequestParam("memberId") String memberId,
|
||||
@RequestParam("memberId") String memberId,
|
||||
@RequestParam("page") int page,
|
||||
@RequestParam("pageSize") int pageSize
|
||||
|
||||
){
|
||||
return memberService.queryMemberAccount(memberId,page,pageSize);
|
||||
) {
|
||||
return memberService.queryMemberAccount(memberId, page, pageSize);
|
||||
}
|
||||
|
||||
|
||||
// public Result returnFlow(@RequestHeader("token") String token,
|
||||
// @RequestHeader("loginName") String loginName,
|
||||
// @RequestHeader("clientType") String clientType,
|
||||
// @RequestParam("flowId") String flowId
|
||||
// ){
|
||||
//
|
||||
//
|
||||
//
|
||||
// }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user