|
@@ -3,6 +3,7 @@ package com.huimv.farm.damsubsidy.controller;
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.lang.UUID;
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.huimv.farm.damsubsidy.common.token.TokenSign;
|
|
|
import com.huimv.farm.damsubsidy.common.utils.Result;
|
|
@@ -191,7 +192,12 @@ public class BillSubsidyController {
|
|
|
@PostMapping("/QRCode")
|
|
|
public Result QrCode(@RequestBody Map<String, String> paramsMap) {
|
|
|
String id = paramsMap.get("id");
|
|
|
- return new Result(ResultCode.SUCCESS, subsidyService.getById(id));
|
|
|
+ BillSubsidy subsidy = subsidyService.getById(id);
|
|
|
+ if (ObjectUtil.isEmpty(subsidy)) {
|
|
|
+ return new Result(10001, "订单编号错误!!", false);
|
|
|
+ } else {
|
|
|
+ return new Result(ResultCode.SUCCESS,subsidy);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
@PostMapping("/updatePayStatus")
|
|
@@ -309,4 +315,15 @@ public class BillSubsidyController {
|
|
|
public Result listCountPay(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> parasMap) {
|
|
|
return iBillSubsidyService.countPay(httpServletRequest, parasMap);
|
|
|
}
|
|
|
+
|
|
|
+ public static void main(String[] args) {
|
|
|
+ String str = "1548926646265684";
|
|
|
+ str = "hm:" + str;
|
|
|
+ String encode = Base64.getEncoder().encodeToString(str.getBytes());
|
|
|
+ System.out.println(encode);
|
|
|
+ //Base64解码
|
|
|
+ byte[] decodedBytes = Base64.getMimeDecoder().decode(encode);
|
|
|
+ String decodedMime = new String(decodedBytes);
|
|
|
+ System.out.println("解码:"+decodedMime);
|
|
|
+ }
|
|
|
}
|