订单详情商品字段名调整

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/GoodsInfoDetailRes.java

@@ -30,12 +30,12 @@ public class GoodsInfoDetailRes implements Serializable {
     /**
      * 商品单位label
      */
-    private String goodsUnitLabel;
+    private String unitLabel;
 
     /**
      * 商品发票税率label
      */
-    private String goodsTaxRateLabel;
+    private String taxRateLabel;
 
     /**
      * 商品id
@@ -45,12 +45,12 @@ public class GoodsInfoDetailRes implements Serializable {
     /**
      * 商品编号
      */
-    private String goodsCode;
+    private String code;
 
     /**
      * 商品名称
      */
-    private String goodsName;
+    private String name;
 
     /**
      * 商品库存
@@ -65,12 +65,12 @@ public class GoodsInfoDetailRes implements Serializable {
     /**
      * 商品发票税率（%）
      */
-    private BigDecimal goodsTaxRate;
+    private BigDecimal taxRate;
 
     /**
      * 商品尺寸大小
      */
-    private String goodsSpec;
+    private String spec;
 
     /**
      * 单位（吨、方、箱、件）

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/GoodsInfoDetailRes.java

@@ -31,12 +31,12 @@ public class GoodsInfoDetailRes implements Serializable {
     /**
      * 商品编号
      */
-    private String goodsCode;
+    private String code;
 
     /**
      * 商品名称
      */
-    private String goodsName;
+    private String name;
 
     /**
      * 商品类型
@@ -46,12 +46,12 @@ public class GoodsInfoDetailRes implements Serializable {
     /**
      * 商品发票税率（%）
      */
-    private String goodsTaxRate;
+    private String taxRate;
 
     /**
      * 商品尺寸大小
      */
-    private String goodsSpec;
+    private String spec;
 
     /**
      * 单位（吨、方、箱、件）
@@ -90,12 +90,12 @@ public class GoodsInfoDetailRes implements Serializable {
     /**
      * 商品单位label
      */
-    private String goodsUnitLabel;
+    private String unitLabel;
 
     /**
      * 商品发票税率label
      */
-    private String goodsTaxRateLabel;
+    private String taxRateLabel;
 
     /**
      * 商品库存

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -393,10 +393,10 @@ public class KwoTradeOrderService {
                 EntCacheResDto entCache = remoteSystemService.queryEntCacheById(goods.getEntId());
                 GoodsInfoDetailRes goodsDetail = new GoodsInfoDetailRes();
                 goodsDetail.setGoodsTypeLabel(DictEnum.getLabel(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), goods.getGoodsType()))
-                        .setGoodsUnitLabel(DictEnum.getLabel(DictTypeEnum.UNIT_TYPE.getType(), goods.getUnit())).setGoodsAmount(goods.getAmount())
-                        .setGoodsTaxRateLabel(DictEnum.getLabel(DictTypeEnum.TAX_RATE.getType(), goods.getTaxRate()))
-                        .setGoodsId(goods.getId()).setGoodsCode(goods.getCode()).setGoodsName(goods.getName())
-                        .setGoodsType(goods.getGoodsType()).setGoodsTaxRate(goods.getTaxRate()).setGoodsSpec(goods.getSpec())
+                        .setUnitLabel(DictEnum.getLabel(DictTypeEnum.UNIT_TYPE.getType(), goods.getUnit())).setGoodsAmount(goods.getAmount())
+                        .setTaxRateLabel(DictEnum.getLabel(DictTypeEnum.TAX_RATE.getType(), goods.getTaxRate()))
+                        .setGoodsId(goods.getId()).setCode(goods.getCode()).setName(goods.getName())
+                        .setGoodsType(goods.getGoodsType()).setTaxRate(goods.getTaxRate()).setSpec(goods.getSpec())
                         .setUnit(goods.getUnit()).setPriceRangeId(orderGoods.getPriceRangeId()).setUnitPrice(orderGoods.getUnitPrice())
                         .setSkuId(orderGoods.getSkuId()).setCollectionUnitId(goods.getEntId())
                         .setCollectionUnit(Objects.isNull(entCache) ? null : entCache.getFirmName());