yshop1.4.2 商品新增多图评价,订单新增快递查询,导出最新sql

yshop-api/src/main/java/co/yixiang/modules/order/entity/YxStoreOrder.java

@@ -116,6 +116,8 @@ public class YxStoreOrder extends BaseEntity {
     @ApiModelProperty(value = "快递名称/送货人姓名")
     private String deliveryName;
 
+    private String deliverySn;
+
     @ApiModelProperty(value = "发货类型")
     private String deliveryType;
 

yshop-api/src/main/java/co/yixiang/modules/order/web/controller/StoreOrderController.java

@@ -7,6 +7,8 @@ import co.yixiang.common.web.controller.BaseController;
 import co.yixiang.common.web.param.IdParam;
 import co.yixiang.common.web.vo.Paging;
 import co.yixiang.exception.ErrorRequestException;
+import co.yixiang.express.ExpressService;
+import co.yixiang.express.dao.ExpressInfo;
 import co.yixiang.modules.activity.service.YxStorePinkService;
 import co.yixiang.modules.order.entity.YxStoreOrder;
 import co.yixiang.modules.order.entity.YxStoreOrderCartInfo;
@@ -14,10 +16,7 @@ import co.yixiang.modules.order.service.YxStoreOrderCartInfoService;
 import co.yixiang.modules.order.service.YxStoreOrderService;
 import co.yixiang.modules.order.service.YxStoreOrderStatusService;
 import co.yixiang.modules.order.web.dto.*;
-import co.yixiang.modules.order.web.param.OrderParam;
-import co.yixiang.modules.order.web.param.PayParam;
-import co.yixiang.modules.order.web.param.RefundParam;
-import co.yixiang.modules.order.web.param.YxStoreOrderQueryParam;
+import co.yixiang.modules.order.web.param.*;
 import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo;
 import co.yixiang.modules.shop.entity.YxStoreProductReply;
 import co.yixiang.modules.shop.service.YxStoreCartService;
@@ -68,6 +67,7 @@ public class StoreOrderController extends BaseController {
     private final YxStoreCouponUserService couponUserService;
     private final YxSystemConfigService systemConfigService;
     private final YxStorePinkService storePinkService;
+    private final ExpressService expressService;
 
 
     /**
@@ -510,5 +510,19 @@ public class StoreOrderController extends BaseController {
         return ApiResult.ok("ok");
     }
 
+
+    /**@Valid
+     * 获取物流信息,根据传的订单编号 ShipperCode快递公司编号 和物流单号,
+     */
+    @PostMapping("/order/express")
+    @ApiOperation(value = "获取物流信息",notes = "获取物流信息",response = ExpressParam.class)
+    public ApiResult<Object> express( @RequestBody ExpressParam expressInfoDo){
+        ExpressInfo expressInfo = expressService.getExpressInfo(expressInfoDo.getOrderCode(),
+                expressInfoDo.getShipperCode(), expressInfoDo.getLogisticCode());
+        if(!expressInfo.isSuccess()) return ApiResult.fail(expressInfo.getReason());
+        return ApiResult.ok(expressInfo);
+    }
+
+
 }
 

yshop-api/src/main/java/co/yixiang/modules/order/web/param/ExpressParam.java

@@ -0,0 +1,19 @@
+package co.yixiang.modules.order.web.param;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @ClassName ExpressParam
+ * @Author hupeng <610796224@qq.com>
+ * @Date 2019/12/9
+ **/
+@Data
+public class ExpressParam  implements Serializable {
+    //@NotBlank()
+    private String orderCode;
+    private String shipperCode;
+    private String logisticCode;
+}

yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderQueryVo.java

@@ -116,6 +116,8 @@ public class YxStoreOrderQueryVo implements Serializable {
     @ApiModelProperty(value = "快递名称/送货人姓名")
     private String deliveryName;
 
+    private String deliverySn;
+
     @ApiModelProperty(value = "发货类型")
     private String deliveryType;
 

yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java

@@ -26,7 +26,7 @@ public interface YxStoreProductReplyMapper extends BaseMapper<YxStoreProductRepl
 
     @Select("select A.product_score as productScore,A.service_score as serviceScore," +
             "A.comment,A.merchant_reply_content as merchantReplyContent," +
-            "A.merchant_reply_time as merchantReplyTime,A.pics,A.add_time as addTime," +
+            "A.merchant_reply_time as merchantReplyTime,A.pics as pictures,A.add_time as addTime," +
             "B.nickname,B.avatar,C.cart_info as cartInfo" +
             " from yx_store_product_reply A left join yx_user B " +
             "on A.uid = B.uid left join yx_store_order_cart_info C on A.unique = C.unique" +

yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductReplyQueryVo.java

@@ -1,5 +1,6 @@
 package co.yixiang.modules.shop.web.vo;
 
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 
+import java.util.ArrayList;
 import java.util.Date;
 
 /**
@@ -44,6 +46,19 @@ public class YxStoreProductReplyQueryVo implements Serializable {
     @ApiModelProperty(value = "评论图片")
     private String[] pics;
 
+    private String pictures;
+
+    private String[] picturesArr;
+
+    public String[] getPicturesArr() {
+        if(StrUtil.isNotEmpty(pictures)){
+            return pictures.split(",");
+        }else{
+            return new String[]{};
+        }
+
+    }
+
     @ApiModelProperty(value = "评论时间")
     private Integer addTime;
 
@@ -63,7 +78,6 @@ public class YxStoreProductReplyQueryVo implements Serializable {
     private String suk;
 
 
-    private String pictures;
 
     @JsonIgnore
     private String cartInfo;

yshop-api/src/main/resources/config/application-dev.yml

@@ -133,9 +133,9 @@ yshop:
 
   # 快鸟物流查询配置
   express:
-    enable: false
-    appId: "XXXXXXXXX"
-    appKey: "XXXXXXXXXXXXXXXXXXXXXXXXX"
+    enable: true
+    appId:
+    appKey:
     vendors:
       - code: "ZTO"
         name: "中通快递"

yshop-api/src/main/resources/config/application-prod.yml

@@ -142,9 +142,9 @@ yshop:
 
   # 快鸟物流查询配置
   express:
-    enable: false
-    appId: "XXXXXXXXX"
-    appKey: "XXXXXXXXXXXXXXXXXXXXXXXXX"
+    enable: true
+    appId: 1607734
+    appKey:
     vendors:
       - code: "ZTO"
         name: "中通快递"