商品编号相关

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/UserDeliverOrderMgrController.java

@@ -220,6 +220,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 
 	@Log(title = "提货订单导出", businessType = BusinessType.EXPORT)
 	@PostMapping("/export")
+	@ApiOperation("替换订单导出")
 	@PreAuthorize("@ss.hasPermi('order:deliver:export')")
 	public AjaxResult export(@RequestBody UserDeliverOrderQueryParam queryParam) {
 
@@ -271,9 +272,18 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 						&& StringUtils.isNotBlank(deliverOrder.getArea())
 						&& StringUtils.isNotBlank(deliverOrder.getAddress()) && null != deliverOrder.getItems()
 						&& deliverOrder.getItems().size() > 0) {
-					for (UserDeliverOrderItem userDeliverOrderItem : deliverOrder.getItems()) {
+					for (UserDeliverOrderItemVO userDeliverOrderItem : deliverOrder.getItems()) {
 						if (null != userDeliverOrderItem) {
 							DeliverOrderExcel deliverOrderExcel = new DeliverOrderExcel();
+							// 设置商品id
+							deliverOrderExcel.setGoodsId(userDeliverOrderItem.getGoodsId());
+							// 设置商品编号
+							if (Objects.isNull(userDeliverOrderItem.getSkuId())) {
+								deliverOrderExcel.setCode(userDeliverOrderItem.getGoodsCode());
+							} else {
+								deliverOrderExcel.setCode(userDeliverOrderItem.getSkuCode());
+							}
+
 							deliverOrderExcel.setTitle(userDeliverOrderItem.getTitle());
 							deliverOrderExcel.setProperties(userDeliverOrderItem.getProperties());
 							deliverOrderExcel.setGoodsNum(userDeliverOrderItem.getGoodsNum());

mp-service/src/main/java/com/qs/mp/admin/domain/Goods.java

@@ -57,6 +57,10 @@ public class Goods implements Serializable {
   @TableField("category_id")
   private Long categoryId;
 
+  @ApiModelProperty("商品编码")
+  @TableField("goods_code")
+  private String goodsCode;
+
   /**
    * 商品图片
    */

mp-service/src/main/java/com/qs/mp/admin/domain/GoodsSku.java

@@ -44,6 +44,10 @@ public class GoodsSku implements Serializable {
   @TableField("name")
   private String name;
 
+  @ApiModelProperty("sku编码")
+  @TableField("sku_code")
+  private String skuCode;
+
   /**
    * 图片
    */

mp-service/src/main/java/com/qs/mp/admin/domain/param/GoodsParam.java

@@ -34,6 +34,9 @@ public class GoodsParam {
 	@ApiModelProperty(value = "商品类目ID", required = false)
 	private Long categoryId;
 
+	@ApiModelProperty("商品编码")
+	private String goodsCode;
+
 	/**
 	 * 商品图片
 	 */

mp-service/src/main/java/com/qs/mp/admin/domain/vo/GoodsVO.java

@@ -42,6 +42,9 @@ public class GoodsVO {
 	@ApiModelProperty("商品类目ID")
 	private Long categoryId;
 
+	@ApiModelProperty("商品编码")
+	private String goodsCode;
+
 	/**
 	 * 商品图片
 	 */

mp-service/src/main/java/com/qs/mp/user/domain/excel/DeliverOrderExcel.java

@@ -10,6 +10,13 @@ import lombok.Data;
  */
 @Data
 public class DeliverOrderExcel {
+
+	@Excel(name = "商品ID")
+	private Long goodsId;
+
+	@Excel(name = "商品编码")
+	private String code;
+
  
 	/**
 	   * 商品标题

mp-service/src/main/java/com/qs/mp/user/domain/vo/UserDeliverOrderItemVO.java

@@ -14,6 +14,12 @@ import lombok.Data;
 @ApiModel("用户提货订单项VO")
 public class UserDeliverOrderItemVO  extends UserDeliverOrderItem {
 
+	@ApiModelProperty("商品编号")
+	private String goodsCode;
+
+	@ApiModelProperty("sku编号")
+	private String skuCode;
+
 	  // 物流公司名称
 	@ApiModelProperty("物流公司名称")
 	  private  String companyName;

mp-service/src/main/resources/mapper/user/UserDeliverOrderItemMapper.xml

@@ -36,9 +36,11 @@
 	
 	 <!-- 查询用户订单明细列表 -->
     <select id="selectUserDeliverOrderItemVOList" resultType="com.qs.mp.user.domain.vo.UserDeliverOrderItemVO">
-		select t1.*, t2.company_name ,t2.company_home_url ,t2.query_url
+		select t1.*, t2.company_name ,t2.company_home_url ,t2.query_url,t3.goods_code,t4.sku_code
 		from mp_user_deliver_order_item t1
 		left join mp_delivery_company t2 on t1.delivery_id = t2.delivery_id
+        left join mp_goods t3 on t1.goods_id = t3.goods_id
+        LEFT JOIN mp_goods_sku t4 on t1.sku_id = t4.sku_id
 		where t1.order_id = #{orderId}
 	</select>