优化/api/order/selectJdOrder接口

pom.xml

@@ -95,7 +95,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.1.35</version>
+            <version>1.2.74</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->

src/main/java/cn/qg/holmes/controller/mock/keystone/jdbuy/OrderController.java

@@ -46,7 +46,6 @@ public class OrderController {
     @PostMapping("/api/order/submitOrder")
     public JdSubmitOrderResponse qygSubmitOrder(SubmitOrderRequest submitOrderRequest) {
         log.info("收到企业购提交订单请求：{}", JSON.toJSONString(submitOrderRequest));
-//        JSONObject response = new JSONObject();
         JdSubmitOrderResponse response = new JdSubmitOrderResponse();
         JSONArray orderPriceSnapArray = JSON.parseArray(submitOrderRequest.getOrderPriceSnap());
         JSONArray skuInfoArray = JSON.parseArray(submitOrderRequest.getSku());
@@ -63,9 +62,6 @@ public class OrderController {
             BigDecimal price = skuPriceMap.get(skuId);
             orderPrice = orderPrice.add(price.multiply(skuNum));
         }
-//        response.put("success", true);
-//        response.put("resultCode", "0001");
-//        response.put("resultMessage", "下单成功");
         response.setSuccess(true);
         response.setResultCode("0001");
         response.setResultMessage("下单成功");
@@ -79,12 +75,6 @@ public class OrderController {
         jdSumbitOrderInfo.setOrderNakedPrice(orderNakedPrice);
         jdSumbitOrderInfo.setOrderTaxPrice(orderNakedPrice.multiply(TAX).setScale(2, BigDecimal.ROUND_HALF_UP));
 
-//        JSONObject result = new JSONObject();
-//        result.put("jdOrderId", jdOrderId);
-//        result.put("freight", calculateFreight(orderPrice));
-//        result.put("orderPrice", orderPrice);
-//        BigDecimal orderNakedPrice = orderPrice.divide(TAX.add(new BigDecimal(1)), BigDecimal.ROUND_HALF_UP);
-//        result.put("orderNakedPrice", orderNakedPrice);
         List<JdSubmitOrderResponse.JdBizSku> bizSkuList = new ArrayList<>();
         for (SubmitOrderRequest.JdSkuInfo sku : skuInfos) {
             JdSubmitOrderResponse.JdBizSku bizSku = new JdSubmitOrderResponse.JdBizSku();
@@ -108,9 +98,6 @@ public class OrderController {
         jdSumbitOrderInfo.setSku(bizSkuList);
 
         response.setResult(jdSumbitOrderInfo);
-//        result.put("sku", bizSkuList);
-//        result.put("orderTaxPrice", orderNakedPrice.multiply(TAX).setScale(2, BigDecimal.ROUND_HALF_UP));
-//        response.put("result", result);
         // 设置缓存，方便后面查询京东订单详情接口使用
         redisUtils.set(QYG_ORDER_PREFIX + jdOrderId, JSON.toJSONString(response), 604800);
         return response;
@@ -148,18 +135,18 @@ public class OrderController {
      * 7.7 查询订单详情
      */
     @PostMapping("/api/order/selectJdOrder")
-    public JSONObject qygOrderDetail(JdOrderDetailRequest request) {
+    public JdOrderDetailResponse qygOrderDetail(JdOrderDetailRequest request) {
         String jdOrderId = request.getJdOrderId();
         String queryExts = request.getQueryExts();
         String jdOrderInfoRedisValue = (String) redisUtils.get(QYG_ORDER_PREFIX + jdOrderId);
-        JSONObject orderInfo = new JSONObject();
+        JdSubmitOrderResponse orderInfo = null;
         if (!StringUtils.isEmpty(jdOrderInfoRedisValue)) {
-            orderInfo = JSONObject.parseObject(jdOrderInfoRedisValue);
+            orderInfo = JSONObject.parseObject(jdOrderInfoRedisValue, JdSubmitOrderResponse.class);
         }
-        JSONObject response = new JSONObject();
-        response.put("success", true);
-        response.put("resultMessage", "");
-        response.put("resultCode", "0000");
+        JdOrderDetailResponse response = new JdOrderDetailResponse();
+        response.setSuccess(true);
+        response.setResultMessage("");
+        response.setResultCode("0000");
 
         JSONObject result = new JSONObject();
         result.put("pOrder", 0);
@@ -168,12 +155,12 @@ public class OrderController {
         result.put("state", 1);
         result.put("submitState", 1);
         result.put("type", 1);
-        if (!orderInfo.isEmpty()) {
-            result.put("freight", orderInfo.get("freight"));
-            result.put("orderPrice", orderInfo.get("orderPrice"));
-            result.put("orderNakedPrice", orderInfo.get("orderNakedPrice"));
-            result.put("orderTaxPrice", orderInfo.get("orderTaxPrice"));
-            result.put("sku", orderInfo.get("sku"));
+        if (orderInfo != null) {
+            result.put("freight", orderInfo.getResult().getFreight());
+            result.put("orderPrice", orderInfo.getResult().getOrderPrice());
+            result.put("orderNakedPrice", orderInfo.getResult().getOrderNakedPrice());
+            result.put("orderTaxPrice", orderInfo.getResult().getOrderTaxPrice());
+            result.put("sku", orderInfo.getResult().getSku());
         } else {
             // 如果缓存里取不到值，就随便给个值
             result.put("freight", 0);
@@ -197,7 +184,7 @@ public class OrderController {
         }
         result.put("paymentType", 4);
 
-        response.put("result", result);
+        response.setResult(result);
         return response;
     }
 

src/main/java/cn/qg/holmes/entity/mock/keystone/JdBaseResponse.java → src/main/java/cn/qg/holmes/entity/mock/keystone/jdbuy/JdBaseResponse.java

-package cn.qg.holmes.entity.mock.keystone;
+package cn.qg.holmes.entity.mock.keystone.jdbuy;
 
 import lombok.Data;
 

src/main/java/cn/qg/holmes/entity/mock/keystone/jdbuy/JdSubmitOrderResponse.java

 package cn.qg.holmes.entity.mock.keystone.jdbuy;
 
-import cn.qg.holmes.entity.mock.keystone.JdBaseResponse;
 import lombok.Data;
 
 import java.math.BigDecimal;