|
|
@@ -52,6 +52,8 @@ import com.goafanti.demand.service.DemandService;
|
|
|
import com.goafanti.portal.bo.AchievementObject;
|
|
|
import com.goafanti.user.service.UserIdentityService;
|
|
|
import com.goafanti.user.service.UserService;
|
|
|
+import com.goafanti.voucher.bo.JtVoucherDetailListBo;
|
|
|
+import com.goafanti.voucher.bo.JtVoucherListBo;
|
|
|
import com.goafanti.voucher.service.VoucherDetailService;
|
|
|
import com.goafanti.voucher.service.VoucherService;
|
|
|
|
|
|
@@ -783,12 +785,26 @@ public class PublicController extends BaseController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
@RequestMapping(value = "/getUserVoucher", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
public Result getUserVoucher(String uid,Integer pageNo,Integer pageSize){
|
|
|
Result res = new Result();
|
|
|
- res.data(voucherService.selectVoucherList(null,1,1,4,uid, pageNo, pageSize));
|
|
|
- return res;
|
|
|
+ Pagination<JtVoucherListBo> p=voucherService.selectVoucherList(null,1,1,4,uid, pageNo, pageSize);
|
|
|
+ List<JtVoucherListBo> vl=(List<JtVoucherListBo>) p.getList();
|
|
|
+ if (TokenManager.getUserId()==null) return res.data(p);
|
|
|
+ List<String> l=voucherDetailService.getTokenVoucher();
|
|
|
+ for (JtVoucherListBo jt : vl) {
|
|
|
+ for (String s : l) {
|
|
|
+ if (s.equals(jt.getId())) {
|
|
|
+ jt.setIsGet(1);
|
|
|
+ }else {
|
|
|
+ jt.setIsGet(0);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return res.data(p);
|
|
|
}
|
|
|
@RequestMapping(value = "/userGetVoucher", method = RequestMethod.POST)
|
|
|
@ResponseBody
|