歌尔订单返回值修改

src/main/java/com/uas/eis/sdk/entity/GRApiResult.java

@@ -1,5 +1,6 @@
 package com.uas.eis.sdk.entity;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -12,23 +13,29 @@ import java.util.List;
 @Data
 public class GRApiResult<T> {
 
-    /**
+   /* *//**
      * 自定义业务码
      * @return true:成功  false:失败
-     */
+     *//*
     private String success;
 
-    /**
+    *//**
      * 交易为宜值，对应PO中的transId
-     * */
+     * *//*
     private String transId;
 
+    *//**
+     * 错误明细，数组，出现错误时需要返回
+     * *//*
+    private List<Errors> errors;*/
+
     /**
      * 错误明细，数组，出现错误时需要返回
      * */
-    private List<Errors> errors;
+    @JsonProperty("return")
+    private ReturnData returnData;
 
-    public String getSuccess() {
+    /*public String getSuccess() {
         return success;
     }
 
@@ -44,13 +51,13 @@ public class GRApiResult<T> {
     public GRApiResult<T> setTransId(String transId) {
         this.transId = transId;
         return this;
-    }
+    }*/
 
     public GRApiResult(){
 
     }
 
-    public GRApiResult(String success, String transId){
+    /*public GRApiResult(String success, String transId){
         this.success = success;
         this.transId = transId;
     }
@@ -59,6 +66,10 @@ public class GRApiResult<T> {
         this.success = success;
         this.transId = transId;
         this.errors = errors;
+    }*/
+
+    public GRApiResult(ReturnData returnData){
+        this.returnData = returnData;
     }
 
 }

src/main/java/com/uas/eis/sdk/entity/ReturnData.java

@@ -0,0 +1,30 @@
+package com.uas.eis.sdk.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 歌尔响应接口错误信息类
+ * */
+
+@Data
+public class ReturnData {
+
+    /**
+     * 自定义业务码
+     * @return true:成功  false:失败
+     */
+    private String success;
+
+    /**
+     * 交易为宜值，对应PO中的transId
+     * */
+    private String transId;
+
+    /**
+     * 错误明细，数组，出现错误时需要返回
+     * */
+    private List<Errors> errors;
+
+}

src/main/java/com/uas/eis/service/Impl/GEServiceImpl.java

@@ -9,6 +9,7 @@ import com.uas.eis.entity.*;
 import com.uas.eis.sdk.entity.ApiResult;
 import com.uas.eis.sdk.entity.GRApiResult;
 import com.uas.eis.sdk.entity.Errors;
+import com.uas.eis.sdk.entity.ReturnData;
 import com.uas.eis.sdk.resp.ApiResponse;
 import com.uas.eis.service.CommonService;
 import com.uas.eis.service.GEService;
@@ -56,14 +57,16 @@ public class GEServiceImpl implements GEService {
         }else if("14780".equals(dto.getVendorCode())){
             SpObserver.putSp("N_HUASL_T");
         }else {
-            grApiResult.setSuccess("false");
-            grApiResult.setTransId(dto.getTransId());
+            ReturnData returnData = new ReturnData();
+            returnData.setSuccess("false");
+            returnData.setTransId(dto.getTransId());
             List<Errors> errorss = new ArrayList<Errors>();
             Errors errors = new Errors();
             errors.setErrorCode("E07");
             errors.setErrorMsg("供应商编号不是18850或者14780！");
             errorss.add(errors);
-            grApiResult.setErrors(errorss);
+            returnData.setErrors(errorss);
+            grApiResult.setReturnData(returnData);
             return grApiResult;
         }
 
@@ -155,7 +158,10 @@ public class GEServiceImpl implements GEService {
                 "where DPOID = " + poid);
         sqls.add("update SALECONFIRMGRDETAIL set SCGD_TOTAL = round(nvl(SCGD_QTY,0)*nvl(SCGD_PRICE,0),2) where SCGD_SCGID = " + scgid);
         baseDao.execute(sqls);
-        return new GRApiResult("true",dto.getTransId(),null);
+        ReturnData returnData = new ReturnData();
+        returnData.setSuccess("true");
+        returnData.setTransId(dto.getTransId());
+        return new GRApiResult(returnData);
     }
 
     @Override