贸易订单详情、列表返回商品缩略图

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwTradeOrder.java

@@ -161,6 +161,11 @@ public class SckwTradeOrder {
      */
     private String goodsTaxRate;
 
+    /**
+     * 商品缩略图
+     */
+    private String goodsThumb;
+
     /**
      * 商品所属项目名称
      */

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

@@ -101,4 +101,9 @@ public class GoodsInfoDetailRes implements Serializable {
      */
     private String collectionUnit;
 
+    /**
+     * 商品缩略图
+     */
+    private String goodsThumb;
+
 }

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

@@ -25,7 +25,7 @@ public class UnitInfoDetailRes implements Serializable {
     private String unitTypeLabel;
 
     /**
-     * 单位类型（1销售单位、2采购单位）
+     * 单位类型（1采购单位、2销售单位）
      */
     private String unitType;
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/UnitInfo.java

@@ -19,7 +19,7 @@ import org.hibernate.validator.constraints.Range;
 public class UnitInfo {
 
     /**
-     * 单位类型（1销售单位、2采购单位）
+     * 单位类型（1采购单位、2销售单位）
      */
     @NotNull(message = "单位类型不能为空")
     @Range(min = 1, max = 2, message = "非法单位类型")

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

@@ -102,4 +102,9 @@ public class GoodsInfoDetailRes implements Serializable {
      */
     private BigDecimal goodsAmount;
 
+    /**
+     * 商品缩略图
+     */
+    private String goodsThumb;
+
 }

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

@@ -138,7 +138,7 @@ public class KwoTradeOrderService {
             kwoTradeOrderGoodsService.insert(goods);
             order.setGoodsId(goodsDetail.getId()).setUnit(goodsDetail.getUnit()).setUnitPrice(goods.getUnitPrice())
                     .setGoodsName(goodsDetail.getName()).setGoodsType(goodsDetail.getGoodsType()).setGoodsCode(goodsDetail.getCode())
-                    .setGoodsTaxRate(goodsDetail.getTaxRate()).setGoodsSpec(goodsDetail.getSpec());
+                    .setGoodsTaxRate(goodsDetail.getTaxRate()).setGoodsSpec(goodsDetail.getSpec()).setGoodsThumb(goodsDetail.getThumb());
             BeanUtils.copyProperties(goodsInfo, order);
         }
         //单位信息
@@ -458,7 +458,7 @@ public class KwoTradeOrderService {
                         .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())
+                        .setSkuId(orderGoods.getSkuId()).setCollectionUnitId(goods.getEntId()).setGoodsThumb(goods.getThumb())
                         .setCollectionUnit(Objects.isNull(entCache) ? null : entCache.getFirmName());
                 detail.setGoodsInfo(goodsDetail);
             }

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/OrderListRes.java

@@ -114,6 +114,12 @@ public class OrderListRes {
      * 单位（吨、方、箱、件）
      */
     private String goodsSpec;
+
+    /**
+     * 商品缩略图
+     */
+    private String goodsThumb;
+
     /**
      * 订单成交单价
      */