调整商户查询接口ï¼,ï,åŠ添加商户信息修改接口

Api/src/main/java/com/java110/api/bmo/store/IStoreBMO.java

@@ -49,4 +49,6 @@ public interface IStoreBMO extends IApiBaseBMO {
      * @return
      */
     public JSONObject addStore(JSONObject paramInJson);
+
+    public JSONObject updateStore(JSONObject paramInJson);
 }

Api/src/main/java/com/java110/api/bmo/store/impl/StoreBMOImpl.java

@@ -5,14 +5,20 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.store.IStoreBMO;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.smo.store.IStoreInnerServiceSMO;
+import com.java110.dto.store.StoreDto;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.StoreUserRelConstant;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @ClassName StoreBMOImpl
  * @Description TODO
@@ -23,7 +29,8 @@ import org.springframework.stereotype.Service;
  **/
 @Service("storeBMOImpl")
 public class StoreBMOImpl extends ApiBaseBMO implements IStoreBMO {
-
+    @Autowired
+    private IStoreInnerServiceSMO storeInnerServiceSMOImpl;
     /**
      * 添加商户
      *
@@ -42,6 +49,24 @@ public class StoreBMOImpl extends ApiBaseBMO implements IStoreBMO {
 
     }
 
+    @Override
+    public JSONObject updateStore(JSONObject paramInJson) {
+        StoreDto storeDto = new StoreDto();
+        storeDto.setStoreId(paramInJson.getString("storeId"));
+        List<StoreDto> storeDtos = storeInnerServiceSMOImpl.getStores(storeDto);
+        Assert.listOnlyOne(storeDtos, "未找到需要修改的商户或多条数据");
+        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_STORE_INFO);
+        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+        JSONObject businessStore = new JSONObject();
+        businessStore.putAll(BeanConvertUtil.beanCovertMap(storeDtos.get(0)));
+        businessStore.putAll(paramInJson);
+        //计算 应收金额
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessStore", businessStore);
+        return business;
+    }
+
     /**
      * 添加员工
      *

Api/src/main/java/com/java110/api/listener/store/ListStoresListener.java

@@ -58,14 +58,10 @@ public class ListStoresListener extends AbstractServiceApiListener {
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
-        //Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区信息");
-
     }
 
     @Override
     protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-
         StoreDto storeDto = BeanConvertUtil.covertBean(reqJson, StoreDto.class);
         int storeCount = storeInnerServiceSMOImpl.getStoreCount(storeDto);
         List<StoreDto> storeDtos = null;
@@ -77,15 +73,11 @@ public class ListStoresListener extends AbstractServiceApiListener {
         } else {
             stores = new ArrayList<>();
         }
-
         ApiStoreVo apiStoreVo = new ApiStoreVo();
-
         apiStoreVo.setTotal(storeCount);
         apiStoreVo.setRecords((int) Math.ceil((double) storeCount / (double) reqJson.getInteger("row")));
         apiStoreVo.setStores(stores);
-
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiStoreVo), HttpStatus.OK);
-
         context.setResponseEntity(responseEntity);
 
     }
@@ -94,7 +86,6 @@ public class ListStoresListener extends AbstractServiceApiListener {
         StoreAttrDto storeAttrDto = new StoreAttrDto();
         storeAttrDto.setStoreIds(getStoreIds(stores));
         List<StoreAttrDto> storeAttrDtos = storeInnerServiceSMOImpl.getStoreAttrs(storeAttrDto);
-
         for (ApiStoreDataVo storeDataVo : stores) {
             for (StoreAttrDto tmpStoreAttrDto : storeAttrDtos) {
                 if (!storeDataVo.getStoreId().equals(tmpStoreAttrDto.getStoreId())) {

Api/src/main/java/com/java110/api/listener/store/UpdateStoreListener.java

@@ -0,0 +1,66 @@
+package com.java110.api.listener.store;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.bmo.store.IStoreBMO;
+import com.java110.api.listener.AbstractServiceApiListener;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.ServiceCodeConstant;
+import com.java110.utils.util.Assert;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.entity.center.AppService;
+import com.java110.event.service.api.ServiceDataFlowEvent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+
+
+/**
+ * 保存商户侦听
+ * add by wuxw 2019-06-30
+ */
+@Java110Listener("updateStoreListener")
+public class UpdateStoreListener extends AbstractServiceApiListener {
+
+    @Autowired
+    private IStoreBMO storeBMOImpl;
+
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
+
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+
+        HttpHeaders header = new HttpHeaders();
+        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
+        JSONArray businesses = new JSONArray();
+
+        AppService service = event.getAppService();
+
+        businesses.add(storeBMOImpl.updateStore(reqJson));
+
+        ResponseEntity<String> responseEntity = storeBMOImpl.callService(context, service.getServiceCode(), businesses);
+
+        context.setResponseEntity(responseEntity);
+    }
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeConstant.SERVICE_CODE_UPDATE_STORE_INFO;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+
+    @Override
+    public int getOrder() {
+        return DEFAULT_ORDER;
+    }
+}

FrontService/src/main/java/com/java110/front/components/store/ListStoreManageComponent.java

@@ -2,6 +2,7 @@ package com.java110.front.components.store;
 
 
 import com.java110.core.context.IPageData;
+import com.java110.front.smo.store.IGetStoreSMO;
 import com.java110.front.smo.store.IListStoreSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -20,6 +21,8 @@ public class ListStoreManageComponent {
 
     @Autowired
     private IListStoreSMO listStoreSMOImpl;
+    @Autowired
+    private IGetStoreSMO getStoreSMOImpl;
 
     /**
      * 查询钥匙申请列表
@@ -31,6 +34,11 @@ public class ListStoreManageComponent {
         return listStoreSMOImpl.listStores(pd);
     }
 
+
+    public ResponseEntity<String> getStoreInfo(IPageData pd) {
+        return getStoreSMOImpl.getStoreInfo(pd);
+    }
+
     public IListStoreSMO getListStoreSMOImpl() {
         return listStoreSMOImpl;
     }

FrontService/src/main/java/com/java110/front/smo/store/IGetStoreSMO.java

@@ -0,0 +1,21 @@
+package com.java110.front.smo.store;
+
+import com.java110.core.context.IPageData;
+import com.java110.utils.exception.SMOException;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 车辆进场管理服务接口类
+ *
+ * add by wuxw 2019-06-29
+ */
+public interface IGetStoreSMO {
+
+    /**
+     * 查询车辆进场信息
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象数据
+     * @throws SMOException 业务代码层
+     */
+    ResponseEntity<String> getStoreInfo(IPageData pd) throws SMOException;
+}

FrontService/src/main/java/com/java110/front/smo/store/impl/GetStoreSMOImpl.java

@@ -0,0 +1,60 @@
+package com.java110.front.smo.store.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.component.AbstractComponentSMO;
+import com.java110.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
+import com.java110.front.smo.store.IGetStoreSMO;
+import com.java110.front.smo.store.IListStoreSMO;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.exception.SMOException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * 查询carInout服务类
+ */
+@Service("getStoreSMOImpl")
+public class GetStoreSMOImpl extends AbstractComponentSMO implements IGetStoreSMO {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+
+    @Override
+    protected void validate(IPageData pd, JSONObject paramIn) {
+        super.validatePageInfo(pd);
+    }
+
+    @Override
+    protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
+        ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        if(result.getStoreId() == null || result.getStoreId() == ""){
+            throw new IllegalArgumentException("参数异常,没有找到对应的storeId");
+        }
+        paramIn.put("storeId", result.getStoreId());
+
+        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/store.listStores" + mapToUrlParam(paramIn);
+        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",
+                apiUrl,
+                HttpMethod.GET);
+
+        return responseEntity;
+    }
+
+    public RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+    public void setRestTemplate(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+
+    @Override
+    public ResponseEntity<String> getStoreInfo(IPageData pd) throws SMOException {
+        return businessProcess(pd);
+    }
+}

java110-db/src/main/resources/mapper/store/StoreServiceDaoImplMapper.xml

@@ -471,9 +471,20 @@
 
     <!-- 查询商户 -->
     <select id="getStores" parameterType="Map" resultType="Map">
-        select s.store_id,s.b_id,s.user_id,s.name,s.name storeName,s.address,s.tel,s.store_id storeId,
-        s.store_type_cd,s.store_type_cd storeTypeCd, s.nearby_landmarks,s.map_x,s.map_y,s.status_cd,
-        st.name storeTypeName
+        select
+            s.store_id,
+            s.b_id,
+            s.user_id,
+            s.name,s.name storeName,
+            s.address,
+            s.tel,
+            s.store_id storeId,
+            s.store_type_cd,s.store_type_cd storeTypeCd,
+            s.nearby_landmarks,s.nearby_landmarks nearByLandmarks,
+            s.map_x,s.map_x mapX,
+            s.map_y,s.map_y mapY,
+            s.status_cd,
+            st.name storeTypeName
         from s_store s,store_type st
         where s.status_cd = '0'
         and s.store_type_cd = st.store_type_cd

java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java

@@ -134,6 +134,7 @@ public class BusinessTypeConstant {
      */
     public static final String BUSINESS_TYPE_SAVE_STORE_INFO = "200100030001";
 
+
     /**
      * 商户成员加入信息
      */