供应商发货优化

src/main/java/com/caimei365/order/controller/ShipApi.java

@@ -319,7 +319,7 @@ public class ShipApi {
      * 查看商品资质信息
      */
     @ApiOperation("查看商品资质信息（旧：/supplier/qualification/data）")
-    @ApiImplicitParam(required = true, name = "logisticsInfoId", value = "发货物流信息Id")
+    @ApiImplicitParam(required = true, name = "logisticsBatchId", value = "发货物流批次Id")
     @GetMapping("/qualification/list")
     public ResponseJson<List<QualificationVo>> getProductQualification(Integer logisticsBatchId) {
         if (null == logisticsBatchId) {

src/main/java/com/caimei365/order/utils/ImageUtil.java

@@ -24,7 +24,7 @@ public class ImageUtil {
         } else {
             dirName = dirName.trim();
         }
-        if (StringUtils.equalsIgnoreCase("null", src)){
+        if (null == src || StringUtils.equalsIgnoreCase("null", src)){
             src = "";
         } else if (src.indexOf(",") > 0) {
             src = src.substring(0, src.indexOf(","));

src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     config:                             # Config客户端配置
       profile: @activatedProperties@    # 启用配置后缀名称
       label: master                     # 分支名称
-      uri: http://localhost:18001
-      # uri: http://47.119.112.46:18001       # 配置中心地址
-      # uri: http://120.79.162.1:18001          # 配置中心地址（正式环境）
+      # uri: http://localhost:18001      # 配置中心地址（本地）
+      # uri: http://47.119.112.46:18001  # 配置中心地址（测试环境）
+      uri: http://120.79.162.1:18001     # 配置中心地址（正式环境）
       name: order                       # 配置文件名称

src/main/resources/mapper/OrderCommonMapper.xml

@@ -66,7 +66,7 @@
         cop.productId,
         cop.shopId,
         cop.name,
-        cop.image,
+        cop.productImage AS image,
         cop.price1 AS price,
         cop.shopName,
         cop.costPrice,
@@ -183,7 +183,7 @@
         cop.productId,
         cop.shopId,
         cop.name,
-        cop.image,
+        cop.productImage AS image,
         cop.price1 AS price,
         cop.shopName,
         cop.costPrice,
@@ -366,6 +366,7 @@
         li.shopID AS shopId,
         li.updateDate,
         li.remarks
+        FROM logistics_information li
         WHERE li.logisticsBatchID = #{logisticsBatchId}
     </select>
 </mapper>

src/main/resources/mapper/ShipMapper.xml

@@ -241,7 +241,7 @@
             cop.productId,
             cop.shopId,
             cop.name,
-            cop.image,
+            cop.productImage AS image,
             cop.price1 AS price,
             cop.shopName,
             cop.costPrice,