兜底默认值载入

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/InteriorChangeConfigServiceImpl.java

@@ -12,6 +12,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
@@ -68,6 +69,11 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
     @Autowired
     private FlowRpcSupplierSendService supplierSendService;
 
+    @Value("${change.goods.principal.name}")
+    private String defaultName;
+    @Value("${change.goods.principal.email}")
+    private String defaultEmail;
+
     /**
      * 接口不完整,关于商品的查询已经完成  供应商查询不完整接口已对接 具体返回值接口测试未完成
      * @param changeCommander
@@ -239,6 +245,8 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
     @Override
     public Map<Long, ChangeGoodsPrincipalPO> queryGoodsPrincipalInfo(List<Long> itemIds){
         Map<Long, ChangeGoodsPrincipalPO> map = new HashMap<>();
+        System.out.println(defaultName);
+        System.out.println(defaultEmail);
         for (Long itemId : itemIds){
             map.put(itemId,new ChangeGoodsPrincipalPO());
         }
@@ -257,6 +265,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
         for (GoodsPurchaseRpc rpc: purchaseRpcs){
             map.get(rpc.getItemId().longValue()).setPurchaseName(rpc.getSupplierName());
             map.get(rpc.getItemId().longValue()).setPurchaseEmail(rpc.getSupplierTraceBusiness());
+            goodsRpc(ChangePrincipalEnum.PURCHASE.getType(),rpc.getSupplierName(),map.get(rpc.getItemId().longValue()));
         }
         //SQE
         for(Long itemId : itemIds){
@@ -268,6 +277,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
                 //需要验证返回值 是否正确
                 map.get(itemId).setGoodsSqeName(data.getRealName());
                 map.get(itemId).setGoodsSqeEmail(data.getUserName());
+                goodsRpc(ChangePrincipalEnum.SQE.getType(),data.getRealName(),map.get(itemId));
             }
         }
         return map;
@@ -324,10 +334,43 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
             if (type == ChangePrincipalEnum.GOODS_BU.getType()){
                 goodsRpc.setFunctionaryName(rpcMap.get(rpc).get("uid").toString());
                 goodsRpc.setFunctionaryEmail(rpcMap.get(rpc).get("name").toString());
+                goodsRpc(ChangePrincipalEnum.GOODS_BU.getType(), rpcMap.get(rpc).get("uid").toString(),goodsRpc);
             }else {
                 goodsRpc.setGoodsProjectName(rpcMap.get(rpc).get("uid").toString());
                 goodsRpc.setGoodsProjectEmail(rpcMap.get(rpc).get("name").toString());
+                goodsRpc(ChangePrincipalEnum.PROSPECTUS.getType(), rpcMap.get(rpc).get("uid").toString(),goodsRpc);
+            }
+        }
     }
+
+
+    /**
+     * 负责人兜底方法
+     * @param type
+     * @param uid
+     * @param goodsRpc
+     */
+    private void goodsRpc(Integer type,String uid,ChangeGoodsPrincipalPO goodsRpc){
+        if (uid == null){
+            switch (type){
+                case 1:
+                    //BU
+                    goodsRpc.setFunctionaryName(defaultName);
+                    goodsRpc.setFunctionaryEmail(defaultEmail);
+                case 2:
+                    //采购
+                    goodsRpc.setPurchaseName(defaultName);
+                    goodsRpc.setPurchaseEmail(defaultEmail);
+                case 3:
+                    //计划
+                    goodsRpc.setGoodsProjectName(defaultName);
+                    goodsRpc.setGoodsProjectName(defaultEmail);
+                case 4:
+                    //SQE
+                    goodsRpc.setGoodsSqeName(defaultName);
+                    goodsRpc.setGoodsSqeEmail(defaultEmail);
+            }
+
         }
     }
 

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/po/ChangeGoodsPrincipalPO.java

@@ -30,23 +30,24 @@ public class ChangeGoodsPrincipalPO {
     private String purchaseEmail;
 
     /**
-     * SQE 名称
+     * 计划负责人名称
      */
-    private String goodsSqeName;
+    private String goodsProjectName;
 
     /**
-     * SQE 邮箱
+     * 计划负责人邮箱
      */
-    private String goodsSqeEmail;
+    private String goodsProjectEmail;
 
     /**
-     * 计划负责人名称
+     * SQE 名称
      */
-    private String goodsProjectName;
+    private String goodsSqeName;
 
     /**
-     * 计划负责人邮箱
+     * SQE 邮箱
      */
-    private String goodsProjectEmail;
+    private String goodsSqeEmail;
+
 
 }