订单 提交测试完成

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/Inner/GoblinInnerZhengzaiController.java

@@ -2,8 +2,13 @@ package com.liquidnet.service.goblin.controller.Inner;
 
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.erp.config.ErpWdtClient;
+import com.liquidnet.service.erp.constant.ErpEnum;
 import com.liquidnet.service.erp.param.TradeListParam;
+import com.liquidnet.service.erp.vo.TradePushVo;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreZhengzaiCommonParam;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.manage.IGoblinConsumerService;
@@ -17,7 +22,10 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 正在下单活动管理
@@ -136,17 +144,29 @@ public class GoblinInnerZhengzaiController {
     }
 
 
-    @Autowired
-    GoblinOrderUtils goblinOrderUtils;
-
-    @PostMapping("test112233")
-    @ApiOperation("测试11")
-    @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "orderId"),
-    })
-    public ResponseDto<Boolean> test112233(String orderId) {
-        List<TradeListParam> aa = goblinOrderUtils.getErpOrder(orderId);
-        log.info("data = " + JSON.toJSONString(aa));
-        return ResponseDto.success();
-    }
+//    @Autowired
+//    GoblinOrderUtils goblinOrderUtils;
+//    @Autowired
+//    private ErpWdtClient erpWdtClient;
+//
+//    @PostMapping("test112233")
+//    @ApiOperation("测试11")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "orderId"),
+//    })
+//    public ResponseDto<TradePushVo> test112233(String orderId) {
+////        List<TradeListParam> aa = goblinOrderUtils.getErpOrder(orderId);
+////        log.info("data = " + JSON.toJSONString(aa));
+////        return ResponseDto.success();
+//
+//
+//        Map<String, String> param = CollectionUtil.linkMapStringString();
+//        param.put("shop_no", "mdtk2-test");
+////        List<HashMap<String, Object>> tradeList = new ArrayList<>();
+////        tradeList.add(TradeListParam.getNew().test(num));
+//        param.put("trade_list", JSON.toJSONString(goblinOrderUtils.getErpOrder(orderId)));
+//        String json = erpWdtClient.execute(ErpEnum.WdtAPI.TRADE_PUSH.getUri(), param);
+//        TradePushVo data = JsonUtils.fromJson(json, TradePushVo.class);
+//        return ResponseDto.success(data);
+//    }
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinOrderUtils.java

@@ -147,19 +147,13 @@ public class GoblinOrderUtils {
             orderSkuParam.setRefund_status(0);
             orderSkuParam.setGoods_id(orderSkuVo.getSpuId());
             orderSkuParam.setSpec_id(orderSkuVo.getSkuId());
-//            orderSkuParam.setGoods_no(orderSkuVo.getSpuErpCode());
-//            orderSkuParam.setSpec_no(orderSkuVo.getSkuErpCode());
-
-            orderSkuParam.setGoods_no("mdsk01");
-            orderSkuParam.setSpec_no("mdsk01");
-
-
+            orderSkuParam.setGoods_no(orderSkuVo.getSpuErpCode());
+            orderSkuParam.setSpec_no(orderSkuVo.getSkuErpCode());
             orderSkuParam.setGoods_name(orderSkuVo.getSpuName());
             orderSkuParam.setAdjust_amount(BigDecimal.ZERO);
             orderSkuParam.setDiscount(BigDecimal.ZERO);
             orderSkuParam.setShare_discount(orderSkuVo.getPriceVoucher());
             warehouseNo = orderSkuVo.getWarehouseNo();
-            log.info("sku = " + orderSkuParam);
             listOrderSku.add(orderSkuParam);
         }
         //配置订单维度数据