|
|
@@ -782,25 +782,23 @@ public class PublicController extends BaseController {
|
|
|
res.setData(pagination);
|
|
|
return res;
|
|
|
}
|
|
|
- @RequestMapping(value = "/InvitationCode", method = RequestMethod.GET)
|
|
|
+
|
|
|
+ @RequestMapping(value = "/getUserVoucher", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
- public Result InvitationCode() {
|
|
|
+ public Result getUserVoucher(String uid,Integer pageNo,Integer pageSize){
|
|
|
Result res = new Result();
|
|
|
- res.data(InvitationCodeUtils.toSerialCode(new Date().getTime()));
|
|
|
+ res.data(voucherService.selectVoucherList(null,1,1,4,uid, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
- @RequestMapping(value = "/getVoucher", method = RequestMethod.POST)
|
|
|
+ @RequestMapping(value = "/userGetVoucher", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
- public void getVoucher(String uid){
|
|
|
- List<String> ids=voucherService.getSourceVoucher(0);
|
|
|
- for (String s : ids) {
|
|
|
- JtVoucherDetail j=new JtVoucherDetail();
|
|
|
- j.setId(jDBCIdGenerator.generateId().toString());
|
|
|
- j.setReceiveTime(new Date());
|
|
|
- j.setVoucherId(s);
|
|
|
- j.setUseUid(uid);
|
|
|
- j.setStatus(0);
|
|
|
- voucherDetailService.saveVoucherDetail(j);
|
|
|
+ public Result userGetVoucher(String uid,String vid){
|
|
|
+ Result res = new Result();
|
|
|
+ if(StringUtils.isBlank(uid)&&TokenManager.getUserId()!=null)uid=TokenManager.getUserId();
|
|
|
+ if(StringUtils.isBlank(vid)) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","抵用券"));
|
|
|
}
|
|
|
+ res.data(voucherDetailService.saveUserGetVoucher(uid,vid));
|
|
|
+ return res;
|
|
|
}
|
|
|
}
|