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

Dev

See merge request quanshu/mp-server!713

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

@@ -313,6 +313,10 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 							deliverOrderExcel.setShoppingLink(userDeliverOrderItem.getShoppingLink());
 							deliverOrderExcel.setReceiver(deliverOrder.getReceiver());
 							deliverOrderExcel.setTel(deliverOrder.getTel());
+							deliverOrderExcel.setDeliveryFlowId(userDeliverOrderItem.getDeliveryFlowId());
+							deliverOrderExcel.setCompanyName(userDeliverOrderItem.getCompanyName());
+							deliverOrderExcel.setGoodsCost(userDeliverOrderItem.getGoodsCost());
+
 							String address = deliverOrder.getProvince() + deliverOrder.getCity()
 									+ deliverOrder.getArea() + deliverOrder.getAddress();
 							deliverOrderExcel.setAddress(address);

mp-framework/src/main/java/com/qs/mp/framework/monitor/SendErrorMsgAppender.java

@@ -31,7 +31,7 @@ public class SendErrorMsgAppender extends UnsynchronizedAppenderBase<ILoggingEve
         || throwableMsg.startsWith("盲票已付款，") || throwableMsg.startsWith("盲票已兑奖") || throwableMsg.startsWith("登录用户不存在：")
         || throwableMsg.startsWith("用户不存在/密码错误") || throwableMsg.startsWith("验证码已失效") || throwableMsg.startsWith("您已经助力过了")
         || throwableMsg.startsWith("您已经获取过抽奖码了") || throwableMsg.startsWith("奖品总数值不相同") || throwableMsg.startsWith("包含已兑奖记录的奖品不能从奖级中删除")
-        || throwableMsg.startsWith("登录账号不存在")
+        || throwableMsg.startsWith("登录账号不存在") || throwableMsg.startsWith("已选择更高级的渠道,不支持渠道相互嵌套!")
         )) {
           return;
         }

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

@@ -42,6 +42,9 @@ public class DeliverOrderExcel {
     @Excel(name = "数量")
     private Integer goodsNum;
 
+    @Excel(name = "商品成本")
+    private Integer goodsCost;
+
     @Excel(name = "供应商名称")
     private String supplierName;
 
@@ -92,6 +95,12 @@ public class DeliverOrderExcel {
     @Excel(name = "商品发货状态")
     private String itemStatus;
 
+    @Excel(name = "快递公司")
+    private String companyName;
+
+    @Excel(name = "快递单号")
+    private String deliveryFlowId;
+
 
     @Excel(name = "买家留言")
     private String memo;

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

@@ -1,6 +1,7 @@
 package com.qs.mp.user.domain.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.qs.mp.common.annotation.Excel;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 
 import io.swagger.annotations.ApiModel;
@@ -28,6 +29,9 @@ public class UserDeliverOrderItemVO  extends UserDeliverOrderItem {
 	@ApiModelProperty("商品价值")
 	private Integer goodsValue;
 
+	@ApiModelProperty("商品成本")
+	private Integer goodsCost;
+
 	@JSONField(serialize = false)
 	@ApiModelProperty("sku价值")
 	private Integer skuValue;

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

@@ -36,7 +36,7 @@
 	
 	 <!-- 查询用户订单明细列表 -->
     <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,t3.value goodsValue,t4.value skuValue,t4.sku_code,t5.name supplierName
+		select t1.*, t2.company_name ,t2.company_home_url ,t2.query_url,t3.goods_code,t3.value goodsValue,t3.cost goodsCost,t4.value skuValue,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