Merge branch 'dev_kuaidi_20221026'

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/open/OpenShareController.java

@@ -24,7 +24,9 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/open")
@@ -68,7 +70,7 @@ public class OpenShareController extends BaseController {
     @ApiOperation(value = "快递信息回调")
     @PostMapping(value="/courierCallback", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
     @ResponseBody
-    public CommonResult courierCallback( String param) {
+    public Object courierCallback( String param) {
         log.info("快递信息回调：{}",param);
 
         JSONObject jsonObject = JSON.parseObject(param);
@@ -77,8 +79,12 @@ public class OpenShareController extends BaseController {
 
         // 保存快递信息
         orderCourierService.updateCourierInfo(courierInfos);
+        Map<String,Object> result = new HashMap<>();
+        result.put("result",true);
+        result.put("returnCode",200);
+        result.put("message","成功");
 
-        return CommonResult.success("{\n" + "    \"result\":true,\n" + "    \"returnCode\":\"200\",\n" + "    \"message\":\"成功\"\n" + "}");
+        return result;
     }