提交 下单 order相关erp字段添加

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java

@@ -111,7 +111,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     skuAndPreListAndNumber.add(skuId + "," + pre + "," + number);
                     // 判断库存
                     GoblinGoodsSkuInfoVo skuVo = redisUtils.getGoodsSkuInfoVo(skuParam.getSkuId());
-                    if(!skuParam.getSpuId().equals(skuVo.getSpuId())){
+                    if (!skuParam.getSpuId().equals(skuVo.getSpuId())) {
                         throw new Exception("参数异常");
                     }
                     int limitCount = skuVo.getBuyLimit() == 0 ? Integer.MAX_VALUE : skuVo.getBuyLimit();
@@ -290,8 +290,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
 
             orderSku.setSpuErpCode(spuVo.getSpuErpCode());
             orderSku.setSkuErpCode(skuVo.getSkuErpCode());
-            orderSku.setErpType(spuVo.getSpuErpCode());
-            orderSku.setErpWarehouseNo(spuVo.getSpuErpCode());
+            orderSku.setErpType(spuVo.getErpType());
+            orderSku.setErpWarehouseNo(skuVo.getErpWarehouseNo());
 
             orderSku.setSkuImage(skuVo.getSkuPic());
             orderSku.setSkuSpecs(JSON.toJSONString(skuVo.getSkuSpecList()));
@@ -507,15 +507,14 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             payCode = payInnerResultVo.getCode();
             payInnerResultVo.setShowUrl(preParam.getShowUrl());
             payInnerResultVo.setReturnUrl(preParam.getReturnUrl());
-        }
-        else if (preParam.getPayType().equals("pos_crash")) {
+        } else if (preParam.getPayType().equals("pos_crash")) {
             isFree = true;
             preParam.setPayType("POS_CRASH");
             payCode = "POS_CRASH_PAY_CODE";
             payInnerResultVo = GoblinPayInnerResultVo.getNew();
             payInnerResultVo.setPrice(preParam.getPriceActual());
             payInnerResultVo.setPayType(preParam.getPayType());
-        }else {
+        } else {
             isFree = true;
             preParam.setPayType("FREE");
             payCode = "FREE_PAY_CODE";
@@ -1048,7 +1047,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         }
         Integer status = refundCallbackParam.getStatus();
         if (1 == status && (backOrderVo.getStatus() == 0 || backOrderVo.getStatus() == 10)) { // 退款成功
-            log.info("refundCallback,正常退款,编号{}",refundCallbackParam.getOrderRefundCode());
+            log.info("refundCallback,正常退款,编号{}", refundCallbackParam.getOrderRefundCode());
             LinkedList<String> sqls = CollectionUtil.linkedListString();
             LinkedList<Object[]> sqlsOrder = CollectionUtil.linkedListObjectArr();
             LinkedList<Object[]> sqlsOrderSku = CollectionUtil.linkedListObjectArr();