Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!492

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

@@ -423,6 +423,7 @@ public class ChannelOrderMgrController extends BaseApiController {
 							channelOrderExcel.setCreatedTime(channelOrder.getCreatedTime());
 							channelOrderExcel.setItemStatus(channelOrder.getStatus().getValue() > 1 ? "已发货" : "未发货");
 							channelOrderExcel.setOrderId(channelOrder.getOrderId());
+							channelOrderExcel.setMemo(channelOrder.getMemo());
 							channelOrderExcel.setStatus(channelOrder.getStatus().getDesc());
 							channelOrderExcel.setChannelName(channelOrder.getChannelName());
 							channelOrderExcel.setParentName(channelOrder.getParentName());

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

@@ -100,7 +100,7 @@ public class SupplierMgrController extends BaseApiController {
     @PreAuthorize("@ss.hasPermi('business:supplier:remove')")
     @ApiOperation("删除供应商")
     public AjaxResult delete(@PathVariable("id") Long id) {
-        int count = goodsService.count(new LambdaQueryWrapper<Goods>().eq(Goods::getSupplerId, id));
+        int count = goodsService.count(new LambdaQueryWrapper<Goods>().eq(Goods::getSupplierId, id));
         if (count != 0) {
             return AjaxResult.error("该供应商下有商品，不能删除");
         }

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

@@ -3,8 +3,10 @@ package com.qs.mp.web.controller.api.admin;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.qs.mp.admin.domain.Supplier;
 import com.qs.mp.admin.domain.param.UserDeliverOrderQueryParam;
 import com.qs.mp.admin.domain.param.UserDeliverOrderShipParam;
+import com.qs.mp.admin.service.ISupplierService;
 import com.qs.mp.common.annotation.Log;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
@@ -53,6 +55,9 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 	@Autowired
 	private IUserDeliverOrderItemService userDeliverOrderItemService;
 
+	@Autowired
+	private ISupplierService supplierService;
+
 //	@Autowired
 //	private IUserPrizeStorageService userPrizeStorageService;
 //
@@ -289,6 +294,9 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 							deliverOrderExcel.setGoodsNum(userDeliverOrderItem.getGoodsNum());
 							deliverOrderExcel.setCreatedTime(deliverOrder.getCreatedTime());
 							deliverOrderExcel.setOrderId(deliverOrder.getOrderId());
+							deliverOrderExcel.setMemo(deliverOrder.getMemo());
+							deliverOrderExcel.setSupplierName(userDeliverOrderItem.getSupplierName());
+							deliverOrderExcel.setShoppingLink(userDeliverOrderItem.getShoppingLink());
 							deliverOrderExcel.setReceiver(deliverOrder.getReceiver());
 							deliverOrderExcel.setTel(deliverOrder.getTel());
 							String address = deliverOrder.getProvince() + deliverOrder.getCity()

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

@@ -225,7 +225,7 @@ public class UserDeliverOrderController extends BaseApiController {
     if (null == orderSettleVO.getAddr()) {
       return AjaxResult.error("请填写收货地址");
     }
-    String orderId = userDeliverOrderService.submitOrder(userId, orderSettleVO);
+    String orderId = userDeliverOrderService.submitOrder(userId,order.getMemo(), orderSettleVO);
     JSONObject jsonObject = new JSONObject();
     jsonObject.put("orderId", orderId);
     if (orderSettleVO.getPayAmt() > 0) {

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

@@ -130,8 +130,8 @@ public class Goods implements Serializable {
   private String merchantInfo;
 
   @ApiModelProperty("供应商ID")
-  @TableField("suppler_id")
-  private Long supplerId;
+  @TableField("supplier_id")
+  private Long supplierId;
 
   @ApiModelProperty("采购链接")
   @TableField("shopping_link")

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

@@ -121,7 +121,7 @@ public class GoodsParam {
 	private String merchantInfo;
 
 	@ApiModelProperty("供应商ID")
-	private Long supplerId;
+	private Long supplierId;
 
 	@ApiModelProperty("采购链接")
 	private String shoppingLink;

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

@@ -136,7 +136,7 @@ public class GoodsVO {
 	private String merchantInfo;
 
 	@ApiModelProperty("供应商ID")
-	private Long supplerId;
+	private Long supplierId;
 
 	@ApiModelProperty("采购链接")
 	private String shoppingLink;

mp-service/src/main/java/com/qs/mp/channel/domain/excel/ChannelOrderExcel.java

@@ -63,4 +63,7 @@ public class ChannelOrderExcel {
 	@Excel(name = "收货地址")
 	private String address;
 
+	@Excel(name = "买家留言")
+	private String memo;
+
 }

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

@@ -87,8 +87,8 @@ public class UserDeliverOrderItem implements Serializable {
   private Integer goodsNum;
 
   @ApiModelProperty("供应商ID")
-  @TableField("suppler_id")
-  private Long supplerId;
+  @TableField("supplier_id")
+  private Long supplierId;
 
   @ApiModelProperty("采购链接")
   @TableField("shopping_link")

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

@@ -1,7 +1,11 @@
 package com.qs.mp.user.domain.excel;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.qs.mp.common.annotation.Excel;
+
 import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -11,71 +15,83 @@ import lombok.Data;
 @Data
 public class DeliverOrderExcel {
 
-	@Excel(name = "商品ID")
-	private Long goodsId;
-
-	@Excel(name = "商品编码")
-	private String code;
-
- 
-	/**
-	   * 商品标题
-	   */
-	  @Excel(name = "商品名称")
-	  private String title;
-
-	  
-	  /**
-	   * sku 属性
-	   */
-	  @Excel(name = "规格")
-	  private String properties;
-
-
-	  /**
-	   * 商品数量
-	   */
-	  @Excel(name = "数量")
-	  private Integer goodsNum;
-	  
-	  /**
-	   * 创建时间
-	   */
-	  @Excel(name = "下单时间")
-	  private Date createdTime;
-	  
-	  @Excel(name = "订单编号")
-	  private String orderId;
-	  
-	  /**
-	   * 收货人
-	   */
-	  @Excel(name = "收货人")
-	  private String receiver;
-
-	  /**
-	   * 收货人电话
-	   */
-	  @Excel(name = "联系电话")
-	  private String tel;
-
-	  /**
-	   * （省-市-区-详细地址）
-	   */
-	  @Excel(name = "收货地址")
-	  private String address;
-	  
-
-	  /**
-	   * 订单状态
-	   */
-	  @Excel(name = "订单状态")
-	  private String status;
-	  
-	  
-	  /**
-	   * 商品发货状态， 有物流单号默认为已发货
-	   */
-	  @Excel(name = "商品发货状态")
-	  private String itemStatus;
+    @Excel(name = "商品ID")
+    private Long goodsId;
+
+    @Excel(name = "商品编码")
+    private String code;
+
+
+    /**
+     * 商品标题
+     */
+    @Excel(name = "商品名称")
+    private String title;
+
+
+    /**
+     * sku 属性
+     */
+    @Excel(name = "规格")
+    private String properties;
+
+
+    /**
+     * 商品数量
+     */
+    @Excel(name = "数量")
+    private Integer goodsNum;
+
+    /**
+     * 创建时间
+     */
+    @Excel(name = "下单时间")
+    private Date createdTime;
+
+    @Excel(name = "订单编号")
+    private String orderId;
+
+    /**
+     * 收货人
+     */
+    @Excel(name = "收货人")
+    private String receiver;
+
+    /**
+     * 收货人电话
+     */
+    @Excel(name = "联系电话")
+    private String tel;
+
+    /**
+     * （省-市-区-详细地址）
+     */
+    @Excel(name = "收货地址")
+    private String address;
+
+
+    /**
+     * 订单状态
+     */
+    @Excel(name = "订单状态")
+    private String status;
+
+
+    /**
+     * 商品发货状态， 有物流单号默认为已发货
+     */
+    @Excel(name = "商品发货状态")
+    private String itemStatus;
+
+    @ApiModelProperty("供应商")
+    private String supplierName;
+
+
+    @ApiModelProperty("商品采购链接")
+    private String shoppingLink;
+
+    @Excel(name = "买家留言")
+    private String memo;
+
+
 }

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

@@ -20,6 +20,9 @@ public class UserDeliverOrderItemVO  extends UserDeliverOrderItem {
 	@ApiModelProperty("sku编号")
 	private String skuCode;
 
+	@ApiModelProperty("供应商名称")
+	private String supplierName;
+
 	  // 物流公司名称
 	@ApiModelProperty("物流公司名称")
 	  private  String companyName;

mp-service/src/main/java/com/qs/mp/user/service/IUserDeliverOrderService.java

@@ -32,7 +32,7 @@ public interface IUserDeliverOrderService extends IService<UserDeliverOrder> {
 	 * @param orderSettleVO
 	 * @return
 	 */
-	String submitOrder(Long userId, DeliverOrderSettleVO orderSettleVO);
+	String submitOrder(Long userId,String memo, DeliverOrderSettleVO orderSettleVO);
 
 	/**
 	 * 取消订单

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.qs.mp.admin.domain.Goods;
 import com.qs.mp.admin.domain.param.UserDeliverOrderShipParam;
+import com.qs.mp.admin.service.IGoodsService;
 import com.qs.mp.common.enums.DeliverOrderStatusEnum;
 import com.qs.mp.common.enums.DeliverTypeEnum;
 import com.qs.mp.common.enums.PrizeStorageStatusEnum;
@@ -60,9 +62,12 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
   @Autowired
   private IUserPrizeStorageService userPrizeStorageService;
 
+  @Autowired
+  private IGoodsService goodsService;
+
   @Override
   @Transactional
-  public String submitOrder(Long userId, DeliverOrderSettleVO orderSettleVO) {
+  public String submitOrder(Long userId, String memo, DeliverOrderSettleVO orderSettleVO) {
     UserDeliverOrder userDeliverOrder = new UserDeliverOrder();
     userDeliverOrder.setOrderId(bizIdGenerator.newIdWithUidSharding(String.valueOf(userId)));
     userDeliverOrder.setUserId(userId);
@@ -76,7 +81,7 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
     userDeliverOrder.setOrderNum(orderSettleVO.getPrizeList().stream().mapToInt(UserPrizeStorage::getGoodsNum).sum());
     userDeliverOrder.setPayAmt(orderSettleVO.getPayAmt());
     userDeliverOrder.setFreightAmt(orderSettleVO.getFreightAmt());
-    userDeliverOrder.setMemo(null);
+    userDeliverOrder.setMemo(memo);
     if (orderSettleVO.getPayAmt() > 0) {
       userDeliverOrder.setStatus(DeliverOrderStatusEnum.NOT_PAY);
     } else {
@@ -95,7 +100,12 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
       orderItem.setTitle(prizeStorage.getTitle());
       orderItem.setPicUrl(prizeStorage.getPicUrl());
       orderItem.setGoodsNum(prizeStorage.getGoodsNum());
-      userDeliverOrderItemService.save(orderItem);
+      // 设置供应商id和采购链接
+      Goods goods = goodsService.getById(prizeStorage.getGoodsId());
+      orderItem.setSupplierId(goods.getSupplierId());
+      orderItem.setShoppingLink(goods.getShoppingLink());
+
+        userDeliverOrderItemService.save(orderItem);
       boolean rtn = userPrizeStorageService.update(new LambdaUpdateWrapper<UserPrizeStorage>()
                 .set(UserPrizeStorage::getStatus, PrizeStorageStatusEnum.HAS_DISTRIBUTED)
                 .eq(UserPrizeStorage::getStorageId, prizeStorage.getStorageId()));

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

@@ -36,11 +36,12 @@
 	
 	 <!-- 查询用户订单明细列表 -->
     <select id="selectUserDeliverOrderItemVOList" resultType="com.qs.mp.user.domain.vo.UserDeliverOrderItemVO">
-		select t1.*, t2.company_name ,t2.company_home_url ,t2.query_url,t3.goods_code,t4.sku_code
+		select t1.*, t2.company_name ,t2.company_home_url ,t2.query_url,t3.goods_code,t4.sku_code,t5.name supplierName
 		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
+        LEFT JOIN mp_supplier t5 on t1.supplier_id = t5.id
 		where t1.order_id = #{orderId}
 	</select>