银行入库、出库接口调试 2022年7月15日08点30分

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/ccb/CargoInOutResult.java

@@ -7,10 +7,10 @@ import java.util.List;
 @Data
 public class CargoInOutResult {
 
-   /* private String result;
+    private String result;
 
     private String reason;
 
-    private List<CargoInfo> cargo;*/
+    private CargoInfo cargo;
 
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/ccb/InCargoRsp.java

@@ -13,10 +13,6 @@ public class InCargoRsp {
 
     private String reqUser;
 
-    private String result;
-
-    private String reason;
-
-    private List<CargoInfo> cargoInResults;
+    private List<CargoInOutResult> cargoInResults;
 
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -53,9 +53,7 @@ import com.ruoyi.warehouseBusiness.component.CalculationWarehouseService;
 import com.ruoyi.warehouseBusiness.component.WarehouseBillsfilterService;
 import com.ruoyi.warehouseBusiness.component.impl.QueryWhgenlegServiceImpl;
 import com.ruoyi.warehouseBusiness.domain.*;
-import com.ruoyi.warehouseBusiness.domain.ccb.CargoInfo;
-import com.ruoyi.warehouseBusiness.domain.ccb.InCargoRsp;
-import com.ruoyi.warehouseBusiness.domain.ccb.OutCargoRsp;
+import com.ruoyi.warehouseBusiness.domain.ccb.*;
 import com.ruoyi.warehouseBusiness.domain.dto.CalculateStorageFeesDTO;
 import com.ruoyi.warehouseBusiness.domain.dto.WarehousebillsDTO;
 import com.ruoyi.warehouseBusiness.domain.enums.FeesTypeEnum;
@@ -4221,6 +4219,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 InCargoRsp rsp = new InCargoRsp();
                 rsp.setUserName(corp.getfCname());
                 rsp.setUscc(corp.getUscc());
+                rsp.setReqUser(corp.getfCname());
 
                 List<Map<String, Object>> stockList = tWhgenlegMapper.selectStockList(tWarehouseBills.getfBillno(), tWarehouseBills.getfCorpid());
                 if (CollectionUtil.isEmpty(stockList)) {
@@ -4228,7 +4227,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     return AjaxResult.error("请求银行反馈异常，未找到库存");
                 }
 
-                List<CargoInfo> cargos = new ArrayList<>();
+                List<CargoInOutResult> inOutResults = new ArrayList<>();
                 stockList.forEach(stockMap -> {
                     String temp = JSON.toJSONString(stockMap);
 
@@ -4240,9 +4239,17 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     detail.setRemainNumber(detail.getNumberLeft());
                     detail.setRemainWeight(detail.getWeightLeft());
                     detail.setElectronicTags(warehousebillsitemsElabelMapper.getLabelByTop(tWarehouseBills.getfId()));
+                    detail.setInStorageDate(null);
+
+                    CargoInOutResult cargoInOutResult = new CargoInOutResult();
+                    cargoInOutResult.setResult("Y");
+                    cargoInOutResult.setReason("test");
+                    cargoInOutResult.setCargo(detail);
+
+                    inOutResults.add(cargoInOutResult);
 
-                    cargos.add(detail);
                 });
+                rsp.setCargoInResults(inOutResults);
 
                 String requestTime = DateUtils.dateTimeNow() + (Math.random() * 9 + 1) * 100000;
                 // 签名内容
@@ -4252,47 +4259,41 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         + "requestTime=" + requestTime + "&"
                         + "body=" + JsonUtil.toJson(rsp);
 
-                rsp.setResult("Y");
-                rsp.setCargoInResults(cargos);
-
-               /* CargoInOutResult inOutResult = new CargoInOutResult();
-                inOutResult.setResult("Y");
-                inOutResult.setCargo(cargos);
-
-                List<CargoInOutResult> inOutResults = new ArrayList<>();
-                inOutResults.add(inOutResult);
-                rsp.setCargoInResults(inOutResults);*/
-
-                System.err.println("======" + JsonUtil.toJson(rsp));
+                String sign = ShaUtil.sha256(str);
 
                 OkHttpClient okHttpClient = new OkHttpClient();
                 Request request = new Request.Builder()
                         .addHeader("content-type", "application/json")
                         .addHeader("X-RC-AppId", CcbConstants.APP_ID)
-                        .addHeader("X-RC-Sign", ShaUtil.sha256(str))
+                        .addHeader("X-RC-Sign", sign)
                         .addHeader("X-RC-SignType", "SHA256")
                         .addHeader("X-RC-RequestTime", requestTime)
                         .addHeader("X-RC-RLF-Uid", CcbConstants.PLATFORM_ID)
                         .url(CcbConstants.IN_URL)
+                        .method("post", RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), JsonUtil.toJson(rsp)))
                         .post(RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), JsonUtil.toJson(rsp)))
                         .build();
 
-                System.err.println(request);
+                System.out.println("请求数据=   " + JsonUtil.toJson(rsp));
+
 
                 String s;
                 try {
                     s = Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
                 } catch (IOException e) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    System.out.println("异常信息=" + e);
                     return AjaxResult.error("请求银行反馈异常，" + e.getMessage());
                 }
 
-                System.out.println("建行返回结果：" + s);
+                System.out.println(s);
                 JSONObject result = JSON.parseObject(s);
                 if (!CcbConstants.SUCCESS.equals(result.getString("result"))) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("请求银行反馈失败，" + result.getString("reason"));
                 }
+
+
             }
         }
 
@@ -4606,16 +4607,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     rsp.setResult("Y");
                     rsp.setCargoOutResults(cargos);
 
-                    System.err.println("=======" + rsp);
-
-                   /* CargoInOutResult inOutResult = new CargoInOutResult();
-                    inOutResult.setResult("Y");
-                    inOutResult.setCargo(cargos);
-
-                    List<CargoInOutResult> inOutResults = new ArrayList<>();
-                    inOutResults.add(inOutResult);
-                    rsp.setCargoOutResults(inOutResults);*/
-
                     OkHttpClient okHttpClient = new OkHttpClient();
                     Request request = new Request.Builder()
                             .addHeader("content-type", "application/json")