Merge branch 'dev_erp' into dev_erp_gjy

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/PlatformErpTaskHandler.java → liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/GoblinErpTaskHandler.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
  * platform:goblin
  */
 @Component
-public class PlatformErpTaskHandler {
+public class GoblinErpTaskHandler {
     @Autowired
     private FeignGoblinErpTaskClient feignGoblinErpTaskClient;
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/erp/WdtServiceImpl.java

@@ -422,7 +422,7 @@ public class WdtServiceImpl implements IGoblinErpService {
         CheckGoodsBaseVo checkGoodsBaseVo = JsonUtils.fromJson(json, CheckGoodsBaseVo.class);
         log.error("checkGoodsBaseVo = " + checkGoodsBaseVo);
         if (checkGoodsBaseVo.getTotal_count() == 0) {
-            return ResponseDto.failure("商品不存在");
+            return ResponseDto.failure("ERP商品编码或ERP规格编码不存在");
         } else {
             return ResponseDto.success(true);
         }