新增/api/order/confirmOrder和/api/order/cancel接口

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

 package cn.qg.holmes.controller.mock.keystone;
 
-import cn.qg.holmes.entity.mock.keystone.BizSku;
-import cn.qg.holmes.entity.mock.keystone.JdCancelOrderRequest;
-import cn.qg.holmes.entity.mock.keystone.SubmitOrderRequest;
+import cn.qg.holmes.bean.KeystoneService;
+import cn.qg.holmes.entity.mock.keystone.*;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.RandomStringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -22,6 +22,9 @@ import java.util.Map;
 @RestController
 public class OrderController {
 
+    @Autowired
+    KeystoneService keystoneService;
+
     /**
      * 商品税率
      */
@@ -33,7 +36,7 @@ public class OrderController {
     private final Integer SKU_CATEGORY = 15924;
 
     /**
-     * 企业购提交订单接口
+     * 7.3 企业购提交订单
      * @param submitOrderRequest 请求参数
      * @return
      */
@@ -67,12 +70,13 @@ public class OrderController {
         for (SubmitOrderRequest.JdSkuInfo sku: skuInfos) {
             BizSku bizSku = new BizSku();
             String skuId = sku.getSkuId();
+            ProductItem productItem = keystoneService.getProductItemById(skuId);
             bizSku.setSkuId(Long.valueOf(skuId));
             bizSku.setNum(sku.getNum());
             bizSku.setCategory(SKU_CATEGORY);
             BigDecimal price = skuPriceMap.get(skuId);
             bizSku.setPrice(price);
-            bizSku.setName("xxx商品");
+            bizSku.setName(productItem.getName());
             bizSku.setTax(TAX.multiply(new BigDecimal(102)));
             BigDecimal nakedPrice = price.divide(TAX.add(new BigDecimal(1)), BigDecimal.ROUND_HALF_UP);
             bizSku.setNakedPrice(nakedPrice);
@@ -88,6 +92,20 @@ public class OrderController {
         return response;
     }
 
+    /**
+     * 7.5 确认预占库存订单
+     * @return
+     */
+    @PostMapping("/api/order/confirmOrder")
+    public JSONObject qygConfirmOrder(JdConfirmOrderRequest request) {
+        JSONObject response = new JSONObject();
+        response.put("success", true);
+        response.put("resultMessage", "确认下单成功");
+        response.put("resultCode", "0003");
+        response.put("result", true);
+        return response;
+    }
+
     /**
      * 7.6 取消未确认订单
      */
@@ -101,6 +119,32 @@ public class OrderController {
         return resposne;
     }
 
+    /**
+     * 11.1 查询推送消息
+     * @return
+     */
+    @PostMapping("/api/message/get")
+    public JSONObject qygMessageGet(JdCompanyMsgRequest request) {
+        String type = request.getType();
+        JSONObject response = new JSONObject();
+        response.put("success", true);
+        response.put("resultMessage", "");
+        response.put("resultCode", "0000");
+        JSONArray result = new JSONArray();
+        switch (type) {
+            case "10":
+                // TODO
+                break;
+            case "31":
+                // TODO
+                break;
+            default:
+                break;
+        }
+        response.put("result", result);
+        return response;
+    }
+
 
     /**
      * 列表转Map，key为skuId，value是price

src/main/java/cn/qg/holmes/entity/mock/keystone/JdCompanyMsgRequest.java

+package cn.qg.holmes.entity.mock.keystone;
+
+import lombok.Data;
+
+/**
+ * 11.1 查询推送消息
+ */
+@Data
+public class JdCompanyMsgRequest {
+
+    private String token;
+
+    private String type;
+}

src/main/java/cn/qg/holmes/entity/mock/keystone/JdConfirmOrderRequest.java

+package cn.qg.holmes.entity.mock.keystone;
+
+import lombok.Data;
+
+/**
+ * 7.5 确认预占库存订单
+ */
+@Data
+public class JdConfirmOrderRequest {
+
+    private String token;
+
+    private Long jdOrderId;
+
+    private String poNo;
+}