Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/worker/WorkerTeamLogic.java

@@ -22,9 +22,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -126,16 +124,17 @@ public class WorkerTeamLogic {
                 .in(User::getUserId, websitUsers.stream().map(WebsitUser::getUserId).collect(Collectors.toList()))
                 .list();
         final Map<String, String> userMap = userList.stream().collect(Collectors.toMap(User::getWorkerNumber, User::getNickName));
-        List<WebsitWorkerBean> beanList = new ArrayList<>();
+
+        Map<String, WebsitWorkerBean> workerMap = new HashMap<>();
         for (WebsitUser websitUser : websitUsers) {
             if (userMap.containsKey(websitUser.getWorkerNumber())) {
                 WebsitWorkerBean bean = new WebsitWorkerBean();
                 bean.setWorkerId(websitUser.getWorkerNumber());
                 bean.setWorkerName(userMap.get(websitUser.getWorkerNumber()));
-                beanList.add(bean);
+                workerMap.put(bean.getWorkerId(), bean);
             }
         }
-        return beanList;
+        return new ArrayList<>(workerMap.values());
     }
 
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/utils/CommonUtils.java

@@ -267,8 +267,9 @@ public class CommonUtils {
      * @return File
      */
     public static File getFileByHttpURL(String path, String address, String checkStr, String replacePrefix){
-        String newUrl = path.split("[?]")[0];
+        String newUrl = !path.contains("/img/get?key=") ? path.split("[?]")[0] : path.split("[?]")[1];
         String[] suffix = newUrl.split("/");
+
         //得到最后一个分隔符后的名字
         String fileName = suffix[suffix.length - 1];
         String reqUrl = path;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WebsitStockAccVO.java

@@ -38,7 +38,7 @@ public class WebsitStockAccVO {
     @ApiModelProperty("单位")
     private String goodsStockUnit;
     @ZfireField(tbName = "b")
-    @ApiModelProperty("商品代码")
+    @ApiModelProperty("辅材代码")
     private String goodsCode;
     @ZfireField(tbName = "b")
     @ApiModelProperty("规格")

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WorkerStockAccVO.java

@@ -48,7 +48,7 @@ public class WorkerStockAccVO {
     @ApiModelProperty("单位")
     private String salesUnit;
     @ZfireField(tbName = "b")
-    @ApiModelProperty("商品代码")
+    @ApiModelProperty("辅材代码")
     private String goodsCode;
     @ApiModelProperty("发生价格")
     private BigDecimal price;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WorkerStockVO.java

@@ -55,7 +55,7 @@ public class WorkerStockVO {
     @ApiModelProperty("单位")
     private String salesUnit;
     @ZfireField(tbName = "b")
-    @ApiModelProperty("商品代码")
+    @ApiModelProperty("辅材代码")
     private String goodsCode;
     @ApiModelProperty("库存数量")
     private BigDecimal qty;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WorkerGoodsVO.java

@@ -36,11 +36,11 @@ public class WorkerGoodsVO {
     private String parentCategoryName;
 
     @ZfireField(tbName = "b", hide = true)
-    @ApiModelProperty(value = "商品小类ID")
+    @ApiModelProperty(value = "辅材小类ID")
     private String categoryId;
 
     @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "商品小类")
+    @ApiModelProperty(value = "辅材小类")
     private String categoryName;
 
 //    @ApiModelProperty(value = "商品代码")

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/vender/WebsitVenderGoodsRelaVO.java

@@ -29,15 +29,15 @@ public class WebsitVenderGoodsRelaVO {
     private String venderName;
 
     @ZfireField(hide = true)
-    @ApiModelProperty(value = "商品编号")
+    @ApiModelProperty(value = "辅材编号")
     private String goodsId;
 
     @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "商品名称")
+    @ApiModelProperty(value = "辅材名称")
     private String goodsName;
 
     @ZfireField(tbName = "b", hide = true)
-    @ApiModelProperty(value = "商品代码")
+    @ApiModelProperty(value = "辅材代码")
     private String goodsCode;
 
     @ApiModelProperty(value = "进价")
@@ -47,7 +47,7 @@ public class WebsitVenderGoodsRelaVO {
     private StateEnum relaStatus;
 
     @ZfireField(tbName = "c", hide = true, colName = "parent_category_id")
-    @ApiModelProperty(value = "商品父类编号")
+    @ApiModelProperty(value = "辅材父类编号")
     private String parentCategoryId;
 
     @ZfireField(tbName = "c", colName = "parent_category_name")
@@ -55,7 +55,7 @@ public class WebsitVenderGoodsRelaVO {
     private String parentCategoryName;
 
     @ZfireField(tbName = "b", hide = true)
-    @ApiModelProperty(value = "商品小类编号")
+    @ApiModelProperty(value = "辅材小类编号")
     private String goodsCategoryId;
 
     @ZfireField(tbName = "c", colName = "category_name")