mock

src/main/java/com/bailuntec/ana/application/order/impl/OrderServiceImpl.java

@@ -61,6 +61,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         this.save(order);
         order.getOrderDetailList().forEach(orderDetail -> {
             orderDetail.setOrderId(order.getId());
+            orderDetail.setCnySkuSalePrice(orderDetail.getSkuSalePrice().getAmount().multiply(orderDetail.getSkuSalePrice().getExchangeRate()));
             orderDetailService.save(orderDetail);
 
             orderDetail.getOrderSpecificationList().forEach(orderSpecification -> {
@@ -194,7 +195,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             orderDetail.setPurchasePlat(pdsSkuInfo.getPurchasePlat());
             orderDetail.setTolerance(pdsSkuInfo.getTolerance());
             orderDetail.setCostPrice(pdsSkuInfo.getCostPrice());
-
+            orderDetail.setBrand(pdsSkuInfo.getBrand());
+            orderDetail.setCategory(pdsSkuInfo.getCategory());
             orderDetailService.updateById(orderDetail);
         });
 

src/main/java/com/bailuntec/ana/application/purchase/impl/PurchaseOrderServiceImpl.java

@@ -112,6 +112,8 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
                 purchaseOrder.setTotalTax(new Currency(totalTax));
                 purchaseOrder.setTotalSkuCost(new Currency(totalPrice));
                 purchaseOrder.setTotalShipCost(new Currency(totalShip));
+                purchaseOrder.setTotalPrice(new Currency(totalShip.add(totalTax).add(totalPrice)));
+                purchaseOrder.setCnyTotalPrice(purchaseOrder.getTotalPrice().getAmount());
                 purchaseOrder.setOrderId(purchaseTask.getOrderId());
 
                 baseMapper.insert(purchaseOrder);
@@ -133,6 +135,11 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
                     purchaseOrderDetail.setTax(callBackPurchaseOrderDetail.getTax());
                     purchaseOrderDetail.setShipCost(callBackPurchaseOrderDetail.getShip());
                     purchaseOrderDetail.setSku(callBackPurchaseOrderDetail.getSku());
+                    purchaseOrderDetail.setPrice(new Currency(
+                            callBackPurchaseOrderDetail.getTax().getAmount()
+                                    .add(callBackPurchaseOrderDetail.getShip().getAmount())
+                                    .add(callBackPurchaseOrderDetail.getPrice().getAmount())
+                    ));
                     purchaseOrderDetail.setOrderDetailId(orderDetail.getId());
                     purchaseOrderDetailMapper.insert(purchaseOrderDetail);
 

src/main/java/com/bailuntec/ana/domain/order/Order.java

@@ -151,10 +151,6 @@ public class Order extends BaseModel {
     @ApiModelProperty(value = "oms订单创建时间")
     private LocalDateTime omsOrderCreateTime;
 
-    @ApiModelProperty(value = "采购订单结果查询id")
-    private String purchaseOrderCallbackId;
-
-
     @Valid
     @NotEmpty(groups = {OrderValidGroup.Purchase.class}, message = "订单详情不能为空")
     @NotEmpty(groups = {OrderValidGroup.PublishOrder.class}, message = "没有未采购的sku")

src/main/java/com/bailuntec/ana/infrastructure/common/exception/ErrorCode.java

@@ -12,7 +12,7 @@ public enum ErrorCode {
 
     OR_00001("OR_00001", "订单采购状态异常"),
     OR_00002("OR_00002", "无法获取刊登帐号id"),
-    OR_10003("OR_10003", "找不到对应订单"),
+    OR_10003("OR_10003", "订单号重复"),
 
     PU_10001("PU_10001", "订单详情采购状态异常"),
     PU_10002("PU_10002", "回调订单详情采购sku不存在"),

src/main/java/com/bailuntec/ana/infrastructure/feign/PdsApi.java

@@ -43,6 +43,8 @@ public interface PdsApi {
             pdsSkuInfo.setPurchaseSkuNo(IdWorker.getId());
             pdsSkuInfo.setCostPrice(Currency.TEST);
             pdsSkuInfo.setTolerance(Currency.TEST);
+            pdsSkuInfo.setBrand("测试品牌");
+            pdsSkuInfo.setCategory("测试分类");
             return pdsSkuInfo;
         }
     }

src/main/java/com/bailuntec/ana/vo/product/resp/PdsSkuInfo.java

 package com.bailuntec.ana.vo.product.resp;
 
-import com.bailuntec.ana.interfaces.order.OrderValidGroup;
 import com.bailuntec.ana.vo.order.Currency;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
 /**
  * <p>
  * mock刊登系统sku返回值
@@ -42,5 +36,11 @@ public class PdsSkuInfo {
     @ApiModelProperty(value = "容忍超过成本范围 超出不进行采购")
     private Currency tolerance;
 
+    @ApiModelProperty(value = "品牌")
+    private String brand;
+
+    @ApiModelProperty(value = "分类")
+    private String category;
+
 
 }