修改bug

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

@@ -177,17 +177,16 @@ public class ClerkApiServiceImpl implements ClerkApiService {
 
     @Override
     public ServiceResponse<Integer> saveClerkForPosMember(String clerkName, String clerkCode, Integer storeInfoId, Integer enterpriseId, String cardNO) {
-        ServiceResponse<StoreDTO> storeResponse = storeApiService.getStoreByStoreInfoId(enterpriseId, storeInfoId);
-        if (storeResponse.getResult() != null) {
-            StoreDTO store = storeResponse.getResult();
+        Integer storeId = storeService.getStoreIdByStoreInfoId(enterpriseId, storeInfoId);
+        if (storeId != null) {
             ClerkDTO clerkDTO = new ClerkDTO();
             clerkDTO.setClerkName(clerkName);
             clerkDTO.setClerkCode(clerkCode);
             clerkDTO.setEnterpriseId(enterpriseId);
-            clerkDTO.setStoreInfoId(store.getStoreInfoId());
+            clerkDTO.setStoreInfoId(storeInfoId);
             clerkDTO.setReason(ClerkLogReasonEnum.MEMBER.getCode());
             clerkDTO.setRemark("卡号:" + cardNO);
-            clerkDTO.setStoreName(store.getStoreName());
+//            clerkDTO.setStoreName(store.getStoreName());
             ServiceResponse serviceResponse = this.saveOrUpdate(clerkDTO);
             return serviceResponse;
         } else {
@@ -198,17 +197,16 @@ public class ClerkApiServiceImpl implements ClerkApiService {
 
     @Override
     public ServiceResponse<Integer> saveClerkForPosMember(PosAddClerkDTO posAddClerkDTO) {
-        ServiceResponse<StoreDTO> storeResponse = storeApiService.getStoreByStoreInfoId(posAddClerkDTO.getEnterpriseId(), posAddClerkDTO.getStoreInfoId());
-        if (storeResponse.getResult() != null) {
-            StoreDTO store = storeResponse.getResult();
+        Integer storeId = storeService.getStoreIdByStoreInfoId(posAddClerkDTO.getEnterpriseId(), posAddClerkDTO.getStoreInfoId());
+        if (storeId != null) {
             ClerkDTO clerkDTO = new ClerkDTO();
             clerkDTO.setClerkName(posAddClerkDTO.getClerkName());
             clerkDTO.setClerkCode(posAddClerkDTO.getClerkCode());
             clerkDTO.setEnterpriseId(posAddClerkDTO.getEnterpriseId());
-            clerkDTO.setStoreInfoId(store.getStoreInfoId());
+            clerkDTO.setStoreInfoId(posAddClerkDTO.getStoreInfoId());
             clerkDTO.setReason(ClerkLogReasonEnum.MEMBER.getCode());
             clerkDTO.setRemark("卡号:" + posAddClerkDTO.getCardNO());
-            clerkDTO.setStoreName(store.getStoreName());
+//            clerkDTO.setStoreName(store.getStoreName());
 
             clerkDTO.setStatus((posAddClerkDTO.getOpenCardTime().getTime() + 15552000000L) > new Date().getTime() ? 1 : 0);