代码提交

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserWithdrawalController.java

@@ -134,8 +134,8 @@ public class UserWithdrawalController extends BaseController {
             if (StringUtils.isBlank(content)) {
                 throw new Exception();
             }
-            Map<String, Object> map = JSONObject.parseObject(content);
-            String jsonStr = RSA.decryptPri((String) map.get("sign"), privateKey);
+            JSONObject jsonObject = JSONObject.parseObject(content);
+            String jsonStr = RSA.decryptPri(jsonObject.getString("sign"), privateKey);
             log.info("jsonStr:{}", jsonStr);
 
             Map<String, Object> withdrawRecord = JSONObject.parseObject(jsonStr);
@@ -155,37 +155,36 @@ public class UserWithdrawalController extends BaseController {
     /**
      * 异步回调接收-签署协议
      *
-     * @param content
+     * @param dataStr
      * @param request
      * @return
      */
     @PostMapping("/contractCallback")
-    public String contractCallback(@RequestBody String content, HttpServletRequest request) {
-        log.info("回调请求地址：{} 请求参数：{}", request.getRemoteAddr(), content);
+    public String contractCallback(@RequestBody String dataStr, HttpServletRequest request) {
+        log.info("回调请求地址：{} 请求参数：{}", request.getRemoteAddr(), dataStr);
         try {
-            if (StringUtils.isBlank(content)) {
+            if (StringUtils.isBlank(dataStr)) {
                 throw new Exception();
             }
-            Map<String, Object> map = JSONObject.parseObject(content);
-            String jsonStr = (String) map.get("content");
+            JSONObject data = JSONObject.parseObject(dataStr);
+            JSONObject content = data.getJSONObject("content");
 
-            String return_code = (String) map.get("return_code");
+            String return_code = data.getString("return_code");
 
-            Map<String, Object> record = JSONObject.parseObject(jsonStr);
-            if (CollectionUtils.isEmpty(record) || null == record.get("serialNo")) {
-                log.error("签署失败,返回合同编号为空 {}", content);
+            if (CollectionUtils.isEmpty(content) || null == content.getString("serialNo")) {
+                log.error("签署失败,返回合同编号为空 {}", dataStr);
                 return "failed";
             }
 
             if ("T".equals(return_code)) {
                 userWithdrawalService.contractCallback(
-                        DealStatusEnum.SCCESS.getCode(), record.get("serialNo").toString(),
-                        record.get("contractUrl").toString(), null);
+                        DealStatusEnum.SCCESS.getCode(), content.getString("serialNo"),
+                        content.getString("contractUrl"), null);
                 return "success";
             } else {
-                String return_message = StringUtil.get(map.get("return_message"));
+                String return_message = data.getString("return_message");
                 userWithdrawalService.contractCallback(
-                        DealStatusEnum.FAILED.getCode(), record.get("serialNo").toString(), null, return_message);
+                        DealStatusEnum.FAILED.getCode(), content.getString("serialNo"), null, return_message);
                 return "failed";
             }
         } catch (Exception e) {