Merge branch 'hotfix-20230106-supplierTraceBusinessName' into 'master'

分支hotfix-20230106-supplierTraceBusinessName已上线，自动合并到master

See merge request !8

.gitlab-ci.yml

@@ -79,6 +79,7 @@ test_image_upload:
   only:
     - dev
     - /^feature-.*$/
+    - /^hotfix.*$/
   dependencies:
     - test_package
 

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

@@ -152,29 +152,29 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
 
         if (ChangePrincipalEnum.GOODS_BU.getName().equals(commander)) {
             String detail = itemcenterApiRpcService.getDetail(goodsInfos);
-            logger.error("根据商品查看商品负责BU接口返回值\t" + detail);
+            logger.info("[queryGoodsCommander] goods_bu:{}", detail);
             getGoodsNameEmail(emails, detail);
 
         } else if (ChangePrincipalEnum.PURCHASE.getName().equals(commander)) {
             //采购返回值处理逻辑
             String detail = supplierSendService.queryGoodsPurchase(goodsInfos);
-            logger.error("根据商品查看商品负责采购接口返回值\t" + detail);
+            logger.info("[queryGoodsCommander] purchase:{}", detail);
             JSONObject jsonObject = JSONObject.parseObject(detail);
             List<GoodsPurchaseRpc> purchaseRpcs = JSONObject.parseArray(jsonObject.get("data").toString(), GoodsPurchaseRpc.class);
             for (GoodsPurchaseRpc purchaseRpc : purchaseRpcs) {
                 GoodsResponseRpc goodsRpc = new GoodsResponseRpc();
                 goodsRpc.setEmail(purchaseRpc.getSupplierTraceBusiness());
-                goodsRpc.setName(purchaseRpc.getSupplierName());
+                goodsRpc.setName(purchaseRpc.getSupplierTraceBusinessName());
                 emails.add(goodsRpc);
             }
         } else if (ChangePrincipalEnum.PROSPECTUS.getName().equals(commander)) {
             String detail = pfuApiRpcService.getDetail(goodsInfos);
-            logger.error("根据商品查看商品负责计划接口返回值\t" + detail);
+            logger.info("[queryGoodsCommander] prospectus:{}", detail);
             getGoodsNameEmail(emails, detail);
         } else if (ChangePrincipalEnum.SQE.getName().equals(commander)) {
             for (Long goods : goodsInfos) {
                 String detail = qcApiRpcService.getDetail(goods.intValue());
-                logger.error("根据商品查看商品负责SQE接口返回值\t" + detail);
+                logger.info("[queryGoodsCommander] SQE:{}", detail);
                 JSONObject jsonObject = JSONObject.parseObject(detail);
                 GoodsResponseSqeRpc data = jsonObject.getObject("data", GoodsResponseSqeRpc.class);
                 if (data != null) {
@@ -281,25 +281,25 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
         }
         //商品BU
         String functionary = itemcenterApiRpcService.getDetail(itemIds);
-        logger.error("请求商品BU结果" + functionary);
+        logger.info("[queryGoodsPrincipalInfo] functionary:{}", functionary);
         getGoodsPrincipalNameEmail(ChangePrincipalEnum.GOODS_BU.getType(), map, functionary);
         //计划
         String project = pfuApiRpcService.getDetail(itemIds);
-        logger.error("请求商品计划结果" + project);
+        logger.info("[queryGoodsPrincipalInfo] project:{}", project);
         getGoodsPrincipalNameEmail(ChangePrincipalEnum.PURCHASE.getType(), map, project);
         //商品采购
         String GoodsPurchase = supplierSendService.queryGoodsPurchase(itemIds);
         JSONObject jsonObject = JSONObject.parseObject(GoodsPurchase);
         List<GoodsPurchaseRpc> purchaseRpcs = JSONObject.parseArray(jsonObject.get("data").toString(), GoodsPurchaseRpc.class);
         for (GoodsPurchaseRpc rpc : purchaseRpcs) {
-            map.get(rpc.getItemId().longValue()).setPurchaseName(rpc.getSupplierName());
+            map.get(rpc.getItemId().longValue()).setPurchaseName(rpc.getSupplierTraceBusinessName());
             map.get(rpc.getItemId().longValue()).setPurchaseEmail(rpc.getSupplierTraceBusiness());
-            goodsRpc(ChangePrincipalEnum.PURCHASE.getType(), rpc.getSupplierName(), map.get(rpc.getItemId().longValue()));
+            goodsRpc(ChangePrincipalEnum.PURCHASE.getType(), rpc.getSupplierTraceBusinessName(), map.get(rpc.getItemId().longValue()));
         }
         //SQE
         for (Long itemId : itemIds) {
             String sqe = qcApiRpcService.getDetail(itemId.intValue());
-            logger.error("根据商品查看商品负责SQE接口返回值\t" + sqe);
+            logger.info("[queryGoodsPrincipalInfo] sqe:{}", sqe);
             JSONObject jsonObject1 = JSONObject.parseObject(sqe);
             GoodsResponseSqeRpc data = jsonObject1.getObject("data", GoodsResponseSqeRpc.class);
             if (data != null) {
@@ -317,7 +317,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
         Integer changeExecUserType = req.getChangeExecUserType();
         String changeExecUser = req.getChangeExecUser();
         ChangeCommanderEnum changeCommanderEnum = ChangeCommanderEnum.getChangeCommanderEnum(changeExecUserType);
-        log.debug("[queryCommanderEmail] req:{},changeCommanderEnum:{}", JSON.toJSONString(req), changeCommanderEnum);
+        log.info("[queryCommanderEmail] req:{},changeCommanderEnum:{}", JSON.toJSONString(req), changeCommanderEnum);
         Assert.notNull(changeCommanderEnum, "变更负责人类型错误");
         CommanderResponse commanderResponse = new CommanderResponse();
         switch (changeCommanderEnum) {
@@ -347,7 +347,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
 
                 try {
                     GoodsResponseRpc goodsResponseRpc = queryGoodsCommander(changeCommanderEnum, itemIdList, changeExecUser);
-                    log.debug("[queryCommanderEmail] queryGoodsCommander:{}", JSON.toJSONString(goodsResponseRpc));
+                    log.info("[queryCommanderEmail] queryGoodsCommander:{}", JSON.toJSONString(goodsResponseRpc));
                     commanderResponse.setName(goodsResponseRpc.getName());
                     commanderResponse.setEmail(goodsResponseRpc.getEmail());
                 } catch (Exception e) {

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

@@ -16,4 +16,8 @@ public class GoodsPurchaseRpc {
 
     private String supplierTraceBusiness;
 
+    /**
+     * 商品采购名称
+     */
+    private String supplierTraceBusinessName;
 }