修改日志

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -203,16 +203,22 @@ public class StoreApiServiceImpl implements StoreApiService {
             }
         }
         if (newStore.getStoreType() != null && !newStore.getStoreType().equals(oldStore.getStoreType())) {
-            ServiceResponse<StoreDictDTO> oldStoreType = this.storeDictApiService.getStoreDict("storeType", oldStore.getStoreType().toString());
+            sb.append("门店类型");
+            if (oldStore.getStoreType() != null) {
+                ServiceResponse<StoreDictDTO> oldStoreType = this.storeDictApiService.getStoreDict("storeType", oldStore.getStoreType().toString());
+                sb.append("【").append(oldStoreType.getResult().getKey()).append("】");
+            }
             ServiceResponse<StoreDictDTO> newStoreType = this.storeDictApiService.getStoreDict("storeType", newStore.getStoreType().toString());
-            sb.append("门店类型").append("【").append(oldStoreType.getResult().getKey()).append("】")
-                        .append("变更为【").append(newStoreType.getResult().getKey()).append("】");
+            sb.append("变更为【").append(newStoreType.getResult().getKey()).append("】");
         }
         if (newStore.getErpStatus() != null && !newStore.getErpStatus().equals(oldStore.getErpStatus())) {
-            ServiceResponse<StoreDictDTO> oldStoreStatus = this.storeDictApiService.getStoreDict("storeStatus", oldStore.getErpStatus().toString());
+            sb.append("门店状态");
+            if (oldStore.getErpStatus() != null) {
+                ServiceResponse<StoreDictDTO> oldStoreStatus = this.storeDictApiService.getStoreDict("storeStatus", oldStore.getErpStatus().toString());
+                sb.append("【").append(oldStoreStatus.getResult().getKey()).append("】");
+            }
             ServiceResponse<StoreDictDTO> newStoreStatus = this.storeDictApiService.getStoreDict("storeStatus", newStore.getErpStatus().toString());
-            sb.append("门店状态").append("【").append(oldStoreStatus.getResult().getKey()).append("】")
-                        .append("变更为【").append(newStoreStatus.getResult().getKey()).append("】");
+            sb.append("变更为【").append(newStoreStatus.getResult().getKey()).append("】");
         }
         if (StringUtils.isNotBlank(newStore.getConactsPhone()) && !StringUtils.equals(newStore.getConactsPhone(), oldStore.getConactsPhone())) {
             sb.append("门店电话").append("【").append(oldStore.getConactsPhone()).append("】")