Merge remote-tracking branch 'origin/xinghong-dev'

java110-bean/src/main/java/com/java110/dto/feeDiscount/ComputeDiscountDto.java

@@ -36,6 +36,9 @@ public class ComputeDiscountDto extends PageDto implements Serializable {
 
     private String ruleId;
 
+    //映射关系值
+    private String value;
+
     private List<FeeDiscountSpecDto> feeDiscountSpecs;
 
     private double discountPrice;
@@ -96,4 +99,12 @@ public class ComputeDiscountDto extends PageDto implements Serializable {
     public void setDiscountName(String discountName) {
         this.discountName = discountName;
     }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
 }

java110-bean/src/main/java/com/java110/dto/feeReceipt/FeeReceiptDto.java

@@ -23,6 +23,9 @@ public class FeeReceiptDto extends PageDto implements Serializable {
     private String receiptId;
     private String objType;
 
+    //商户名称
+    private String storeName;
+
 
     private Date createTime;
 
@@ -101,4 +104,12 @@ public class FeeReceiptDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
 }

java110-bean/src/main/java/com/java110/dto/store/StoreUserDto.java

@@ -0,0 +1,168 @@
+package com.java110.dto.store;
+
+import com.java110.dto.PageDto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 员工商户封装
+ *
+ * @author fqz
+ * @date 2020-12-08 19:39
+ */
+public class StoreUserDto extends PageDto implements Serializable {
+
+    //商户id
+    private String storeId;
+
+    //业务id
+    private String bId;
+
+    //用户id
+    private String userId;
+
+    //商户名称
+    private String name;
+
+    //商户地址
+    private String address;
+
+    //商户电话
+    private String tel;
+
+    private String storeTypeCd;
+
+    //地标
+    private String nearbyLandmarks;
+
+    //地区 x坐标地区 x坐标
+    private String mapX;
+
+    //地区 y坐标
+    private String mapY;
+
+    //数据状态
+    private String statusCd;
+
+    //代理商用户id
+    private String storeUserId;
+
+    //用户和代理商关系
+    private String relCd;
+
+    //创建时间
+    private Date createTime;
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+
+    public String getStoreTypeCd() {
+        return storeTypeCd;
+    }
+
+    public void setStoreTypeCd(String storeTypeCd) {
+        this.storeTypeCd = storeTypeCd;
+    }
+
+    public String getNearbyLandmarks() {
+        return nearbyLandmarks;
+    }
+
+    public void setNearbyLandmarks(String nearbyLandmarks) {
+        this.nearbyLandmarks = nearbyLandmarks;
+    }
+
+    public String getMapX() {
+        return mapX;
+    }
+
+    public void setMapX(String mapX) {
+        this.mapX = mapX;
+    }
+
+    public String getMapY() {
+        return mapY;
+    }
+
+    public void setMapY(String mapY) {
+        this.mapY = mapY;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getStoreUserId() {
+        return storeUserId;
+    }
+
+    public void setStoreUserId(String storeUserId) {
+        this.storeUserId = storeUserId;
+    }
+
+    public String getRelCd() {
+        return relCd;
+    }
+
+    public void setRelCd(String relCd) {
+        this.relCd = relCd;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

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

@@ -155,9 +155,9 @@
     <!-- 查询商户属性信息 add by wuxw 2018-07-03 -->
     <select id="getStoreAttrs" parameterType="Map" resultType="Map">
         select
-            sa.b_id,sa.attr_id,sa.attr_id attrId,
-            sa.store_id, sa.store_id storeId,sa.spec_cd,sa.spec_cd specCd,sa.value,sa.status_cd,
-            c.name
+        sa.b_id,sa.attr_id,sa.attr_id attrId,
+        sa.store_id, sa.store_id storeId,sa.spec_cd,sa.spec_cd specCd,sa.value,sa.status_cd,
+        c.name
         from s_store_attr sa inner join spec c on sa.spec_cd = c.spec_cd
         where
         1=1
@@ -474,19 +474,19 @@
     <!-- 查询商户 -->
     <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.nearby_landmarks nearByLandmarks,
-            s.map_x,s.map_x mapX,
-            s.map_y,s.map_y mapY,
-            s.status_cd,
-            st.name storeTypeName
+        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
@@ -561,4 +561,17 @@
         </if>
     </select>
 
+    <!--查询员工和商户信息-->
+    <select id="getStoreUserInfo" parameterType="Map" resultType="Map">
+        select s.store_id,s.b_id,s.user_id,s.name,s.address,s.tel,s.store_type_cd,
+        s.nearby_landmarks,s.map_x,s.map_y,s.create_time,su.store_user_id,su.rel_cd
+        from s_store s left join s_store_user su on s.store_id=su.store_id
+        <where>
+            s.status_cd = "0" and su.status_cd = "0"
+            <if test="userId != null and userId != ''">
+                and su.user_id = #{userId}
+            </if>
+        </where>
+    </select>
+
 </mapper>

java110-interface/src/main/java/com/java110/intf/store/IStoreInnerServiceSMO.java

@@ -3,6 +3,7 @@ package com.java110.intf.store;
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.store.StoreAttrDto;
 import com.java110.dto.store.StoreDto;
+import com.java110.dto.store.StoreUserDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,4 +27,13 @@ public interface IStoreInnerServiceSMO {
 
     @RequestMapping(value = "/getStoreCount", method = RequestMethod.POST)
     public int getStoreCount(@RequestBody StoreDto storeDto);
+
+    /**
+     * 查询员工和员工所属商户信息
+     *
+     * @param storeUserDto
+     * @return
+     */
+    @RequestMapping(value = "/getStoreUserInfo", method = RequestMethod.POST)
+    public List<StoreUserDto> getStoreUserInfo(@RequestBody StoreUserDto storeUserDto);
 }

service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.feeReceipt.FeeReceiptDto;
 import com.java110.dto.feeReceipt.FeeReceiptDtoNew;
 import com.java110.dto.feeReceiptDetail.FeeReceiptDetailDto;
+import com.java110.dto.store.StoreUserDto;
 import com.java110.fee.bmo.feeReceipt.IDeleteFeeReceiptBMO;
 import com.java110.fee.bmo.feeReceipt.IGetFeeReceiptBMO;
 import com.java110.fee.bmo.feeReceipt.ISaveFeeReceiptBMO;
@@ -12,6 +13,7 @@ import com.java110.fee.bmo.feeReceiptDetail.IDeleteFeeReceiptDetailBMO;
 import com.java110.fee.bmo.feeReceiptDetail.IGetFeeReceiptDetailBMO;
 import com.java110.fee.bmo.feeReceiptDetail.ISaveFeeReceiptDetailBMO;
 import com.java110.fee.bmo.feeReceiptDetail.IUpdateFeeReceiptDetailBMO;
+import com.java110.intf.store.IStoreInnerServiceSMO;
 import com.java110.po.feeReceipt.FeeReceiptPo;
 import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
 import com.java110.utils.util.Assert;
@@ -20,6 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping(value = "/feeReceipt")
 public class FeeReceiptApi {
@@ -44,6 +48,9 @@ public class FeeReceiptApi {
     @Autowired
     private IGetFeeReceiptDetailBMO getFeeReceiptDetailBMOImpl;
 
+    @Autowired
+    private IStoreInnerServiceSMO storeInnerServiceSMO;
+
     /**
      * 微信保存消息模板
      *
@@ -114,11 +121,20 @@ public class FeeReceiptApi {
      */
     @RequestMapping(value = "/queryFeeReceipt", method = RequestMethod.GET)
     public ResponseEntity<String> queryFeeReceipt(@RequestParam(value = "communityId") String communityId,
-                                                  @RequestParam(value = "objType",required = false) String objType,
-                                                  @RequestParam(value = "roomId",required = false) String roomId,
-                                                  @RequestParam(value = "receiptId",required = false) String receiptId,
+                                                  @RequestParam(value = "objType", required = false) String objType,
+                                                  @RequestParam(value = "roomId", required = false) String roomId,
+                                                  @RequestParam(value = "receiptId", required = false) String receiptId,
                                                   @RequestParam(value = "page") int page,
-                                                  @RequestParam(value = "row") int row) {
+                                                  @RequestParam(value = "row") int row,
+                                                  @RequestHeader(value = "user_id") String userId) {
+        //获取商户名称
+        StoreUserDto storeUserDto = new StoreUserDto();
+        storeUserDto.setUserId(userId);
+        List<StoreUserDto> storeUserDtos = storeInnerServiceSMO.getStoreUserInfo(storeUserDto);
+        String storeName = "";
+        for (StoreUserDto storeUser : storeUserDtos) {
+            storeName = storeUser.getName();
+        }
         FeeReceiptDto feeReceiptDto = new FeeReceiptDto();
         feeReceiptDto.setPage(page);
         feeReceiptDto.setRow(row);
@@ -126,6 +142,7 @@ public class FeeReceiptApi {
         feeReceiptDto.setReceiptId(receiptId);
         feeReceiptDto.setObjType(objType);
         feeReceiptDto.setObjName(roomId);
+        feeReceiptDto.setStoreName(storeName);
         return getFeeReceiptBMOImpl.get(feeReceiptDto);
     }
 
@@ -140,14 +157,13 @@ public class FeeReceiptApi {
      */
     @RequestMapping(value = "/queryFeeReceiptNew", method = RequestMethod.GET)
     public ResponseEntity<String> queryFeeReceiptNew(@RequestParam(value = "communityId") String communityId,
-                                                  @RequestParam(value = "objType",required = false) String objType,
-                                                  @RequestParam(value = "roomName",required = false) String roomName,
-                                                  @RequestParam(value = "type",required = false) String type,
-                                                     @RequestParam(value = "qstartTime",required = false) String qstartTime,
-                                                     @RequestParam(value = "qendTime",required = false) String qendTime,
+                                                     @RequestParam(value = "objType", required = false) String objType,
+                                                     @RequestParam(value = "roomName", required = false) String roomName,
+                                                     @RequestParam(value = "type", required = false) String type,
+                                                     @RequestParam(value = "qstartTime", required = false) String qstartTime,
+                                                     @RequestParam(value = "qendTime", required = false) String qendTime,
                                                      @RequestParam(value = "page") int page,
-                                                  @RequestParam(value = "row") int row
-    ) {
+                                                     @RequestParam(value = "row") int row) {
         FeeReceiptDtoNew feeReceiptDto = new FeeReceiptDtoNew();
         feeReceiptDto.setPage(page);
         feeReceiptDto.setRow(row);
@@ -156,9 +172,10 @@ public class FeeReceiptApi {
         feeReceiptDto.setQstartTime(qstartTime);
         feeReceiptDto.setQendTime(qendTime);
         feeReceiptDto.setObjType(objType);
-        feeReceiptDto.setObjName(roomName   );
+        feeReceiptDto.setObjName(roomName);
         return getFeeReceiptBMOImpl.gets(feeReceiptDto);
     }
+
     /**
      * 微信保存消息模板
      *
@@ -229,7 +246,7 @@ public class FeeReceiptApi {
      */
     @RequestMapping(value = "/queryFeeReceiptDetail", method = RequestMethod.GET)
     public ResponseEntity<String> queryFeeReceiptDetail(@RequestParam(value = "communityId") String communityId,
-                                                        @RequestParam(value = "receiptId",required = false) String receiptId,
+                                                        @RequestParam(value = "receiptId", required = false) String receiptId,
                                                         @RequestParam(value = "page") int page,
                                                         @RequestParam(value = "row") int row) {
         FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();

service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRuleSpec/IComputeFeeDiscountBMO.java

@@ -1,16 +1,14 @@
 package com.java110.fee.bmo.feeDiscountRuleSpec;
-import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
 import org.springframework.http.ResponseEntity;
 
 public interface IComputeFeeDiscountBMO {
 
-
     /**
      * 查询折扣规则配置
      * add by wuxw
+     *
      * @return
      */
-    ResponseEntity<String> compute(String feeId,String communityId,double cycles,int page,int row );
-
+    ResponseEntity<String> compute(String feeId, String communityId, double cycles, int page, int row);
 
 }

service-fee/src/main/java/com/java110/fee/bmo/feeReceipt/impl/GetFeeReceiptBMOImpl.java

@@ -29,13 +29,19 @@ public class GetFeeReceiptBMOImpl implements IGetFeeReceiptBMO {
         int count = feeReceiptInnerServiceSMOImpl.queryFeeReceiptsCount(feeReceiptDto);
 
         List<FeeReceiptDto> feeReceiptDtos = null;
+        List<FeeReceiptDto> feeReceiptList = new ArrayList<>();
         if (count > 0) {
             feeReceiptDtos = feeReceiptInnerServiceSMOImpl.queryFeeReceipts(feeReceiptDto);
+            for (FeeReceiptDto feeReceipt : feeReceiptDtos) {
+                feeReceipt.setStoreName(feeReceiptDto.getStoreName());
+                feeReceiptList.add(feeReceipt);
+            }
         } else {
             feeReceiptDtos = new ArrayList<>();
+            feeReceiptList.addAll(feeReceiptDtos);
         }
 
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) feeReceiptDto.getRow()), count, feeReceiptDtos);
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) feeReceiptDto.getRow()), count, feeReceiptList);
 
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 

service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountInnerServiceSMOImpl.java

@@ -16,6 +16,7 @@ import com.java110.intf.fee.IFeeDiscountSpecInnerServiceSMO;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
 import com.java110.intf.fee.IPayFeeConfigDiscountInnerServiceSMO;
 import com.java110.po.feeDiscount.FeeDiscountPo;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -49,6 +50,12 @@ public class FeeDiscountInnerServiceSMOImpl extends BaseServiceSMO implements IF
     @Autowired
     private IFeeDiscountSpecInnerServiceSMO feeDiscountSpecInnerServiceSMOImpl;
 
+    //域
+    public static final String DOMAIN_COMMON = "DOMAIN.COMMON";
+
+    //键
+    public static final String DISCOUNT_MODE = "DISCOUNT_MODE";
+
 
     @Override
     public int saveFeeDiscount(@RequestBody FeeDiscountPo feeDiscountPo) {
@@ -156,7 +163,17 @@ public class FeeDiscountInnerServiceSMOImpl extends BaseServiceSMO implements IF
         for (PayFeeConfigDiscountDto tmpPayFeeConfigDiscountDto : payFeeConfigDiscountDtos) {
             doCompute(tmpPayFeeConfigDiscountDto, Double.parseDouble(feeDetailDto.getCycles()), computeDiscountDtos, feeDetailDto.getFeeId());
         }
-        return computeDiscountDtos;
+
+        //取出开关映射的值
+        String value = MappingCache.getValue(DOMAIN_COMMON, DISCOUNT_MODE);
+
+        List<ComputeDiscountDto> computeDiscountDtoList = new ArrayList<>();
+        for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
+            computeDiscountDto.setValue(value);
+            computeDiscountDtoList.add(computeDiscountDto);
+        }
+
+        return computeDiscountDtoList;
 
     }
 

service-store/src/main/java/com/java110/store/dao/IStoreServiceDao.java

@@ -1,9 +1,7 @@
 package com.java110.store.dao;
 
-
 import com.java110.utils.exception.DAOException;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -11,13 +9,14 @@ import java.util.Map;
  * 商户组件内部之间使用，没有给外围系统提供服务能力
  * 商户服务接口类，要求全部以字符串传输，方便微服务化
  * 新建客户，修改客户，删除客户，查询客户等功能
- *
+ * <p>
  * Created by wuxw on 2016/12/27.
  */
 public interface IStoreServiceDao {
 
     /**
      * 保存 商户信息
+     *
      * @param businessStoreInfo 商户信息 封装
      * @throws DAOException 操作数据库异常
      */
@@ -25,6 +24,7 @@ public interface IStoreServiceDao {
 
     /**
      * 保存商户属性
+     *
      * @param businessStoreAttr 商户属性信息封装
      * @throws DAOException 操作数据库异常
      */
@@ -33,6 +33,7 @@ public interface IStoreServiceDao {
 
     /**
      * 保存商户照片信息
+     *
      * @param businessStorePhoto 商户照片
      * @throws DAOException 操作数据库异常
      */
@@ -40,6 +41,7 @@ public interface IStoreServiceDao {
 
     /**
      * 保存商户证件信息
+     *
      * @param businessStoreCerdentials 商户证件
      * @throws DAOException 操作数据库异常
      */
@@ -48,33 +50,34 @@ public interface IStoreServiceDao {
     /**
      * 查询商户信息（business过程）
      * 根据bId 查询商户信息
+     *
      * @param info bId 信息
      * @return 商户信息
      * @throws DAOException
      */
     public Map getBusinessStoreInfo(Map info) throws DAOException;
 
-
     /**
      * 查询商户属性信息（business过程）
+     *
      * @param info bId 信息
      * @return 商户属性
      * @throws DAOException
      */
     public List<Map> getBusinessStoreAttrs(Map info) throws DAOException;
 
-
     /**
      * 查询商户照片
+     *
      * @param info bId 信息
      * @return 商户照片
      * @throws DAOException
      */
     public List<Map> getBusinessStorePhoto(Map info) throws DAOException;
 
-
     /**
      * 查询商户证件信息
+     *
      * @param info bId 信息
      * @return 商户照片
      * @throws DAOException
@@ -83,14 +86,15 @@ public interface IStoreServiceDao {
 
     /**
      * 保存 商户信息 Business数据到 Instance中
+     *
      * @param info
      * @throws DAOException
      */
     public void saveStoreInfoInstance(Map info) throws DAOException;
 
-
     /**
      * 保存 商户属性信息 Business数据到 Instance中
+     *
      * @param info
      * @throws DAOException
      */
@@ -98,42 +102,42 @@ public interface IStoreServiceDao {
 
     /**
      * 保存 商户照片信息 Business数据到 Instance中
+     *
      * @param info
      * @throws DAOException
      */
     public void saveStorePhotoInstance(Map info) throws DAOException;
 
-
     /**
      * 保存 商户证件信息 Business数据到 Instance中
+     *
      * @param info
      * @throws DAOException
      */
     public void saveStoreCerdentialsInstance(Map info) throws DAOException;
 
-
-
     /**
      * 查询商户信息（instance过程）
      * 根据bId 查询商户信息
+     *
      * @param info bId 信息
      * @return 商户信息
      * @throws DAOException
      */
     public Map getStoreInfo(Map info) throws DAOException;
 
-
     /**
      * 查询商户属性信息（instance过程）
+     *
      * @param info bId 信息
      * @return 商户属性
      * @throws DAOException
      */
     public List<Map> getStoreAttrs(Map info) throws DAOException;
 
-
     /**
      * 查询商户照片（instance 过程）
+     *
      * @param info bId 信息
      * @return 商户照片
      * @throws DAOException
@@ -142,6 +146,7 @@ public interface IStoreServiceDao {
 
     /**
      * 查询商户证件信息（instance 过程）
+     *
      * @param info bId 信息
      * @return 商户照片
      * @throws DAOException
@@ -150,22 +155,23 @@ public interface IStoreServiceDao {
 
     /**
      * 修改商户信息
+     *
      * @param info 修改信息
      * @throws DAOException
      */
     public void updateStoreInfoInstance(Map info) throws DAOException;
 
-
     /**
      * 修改商户属性信息
+     *
      * @param info 修改信息
      * @throws DAOException
      */
     public void updateStoreAttrInstance(Map info) throws DAOException;
 
-
     /**
      * 修改商户照片信息
+     *
      * @param info 修改信息
      * @throws DAOException
      */
@@ -173,14 +179,15 @@ public interface IStoreServiceDao {
 
     /**
      * 修改商户证件信息
+     *
      * @param info 修改信息
      * @throws DAOException
      */
     public void updateStoreCerdentailsInstance(Map info) throws DAOException;
 
-
     /**
      * 商户成员加入信息
+     *
      * @param businessMemberStore 商户成员信息 封装
      * @throws DAOException 操作数据库异常
      */
@@ -188,6 +195,7 @@ public interface IStoreServiceDao {
 
     /**
      * 成员加入 保存信息至instance
+     *
      * @param info
      * @throws DAOException
      */
@@ -196,6 +204,7 @@ public interface IStoreServiceDao {
     /**
      * 查询商户成员加入信息（business过程）
      * 根据bId 查询商户信息
+     *
      * @param info bId 信息
      * @return 商户信息
      * @throws DAOException
@@ -205,6 +214,7 @@ public interface IStoreServiceDao {
     /**
      * 查询商户成员加入信息（instance过程）
      * 根据bId 查询商户信息
+     *
      * @param info bId 信息
      * @return 商户信息
      * @throws DAOException
@@ -213,57 +223,58 @@ public interface IStoreServiceDao {
 
     /**
      * 修改商户成员加入信息
+     *
      * @param info 修改信息
      * @throws DAOException
      */
     public void updateMemberStoreInstance(Map info) throws DAOException;
 
-
     /**
      * 保存商户用户信息
+     *
      * @param info
      * @throws DAOException
      */
     public void saveBusinessStoreUser(Map info) throws DAOException;
 
-
     /**
      * 查询物业用户信息
+     *
      * @param info bId 信息
      * @return 物业照片
      * @throws DAOException
      */
     public List<Map> getBusinessStoreUser(Map info) throws DAOException;
 
-
     /**
      * 保存 物业用户信息 Business数据到 Instance中
+     *
      * @param info
      * @throws DAOException
      */
     public void saveStoreUserInstance(Map info) throws DAOException;
 
-
     /**
      * 查询物业用户信息（instance 过程）
+     *
      * @param info bId 信息
      * @return 物业照片
      * @throws DAOException
      */
     public List<Map> getStoreUser(Map info) throws DAOException;
 
-
     /**
      * 修改物业用户信息
+     *
      * @param info 修改信息
      * @throws DAOException
      */
     public void updateStoreUserInstance(Map info) throws DAOException;
 
-
     /**
      * 查询商户信息（instance过程）
      * 根据bId 查询商户信息
+     *
      * @param info bId 信息
      * @return 商户信息
      * @throws DAOException
@@ -272,4 +283,13 @@ public interface IStoreServiceDao {
 
     public int getStoreCount(Map info) throws DAOException;
 
+    /**
+     * 查询员工和员工所属商户信息
+     *
+     * @param info
+     * @return
+     * @throws DAOException
+     */
+    public List<Map> getStoreUserInfo(Map info) throws DAOException;
+
 }

service-store/src/main/java/com/java110/store/dao/impl/StoreServiceDaoImpl.java

@@ -548,4 +548,17 @@ public class StoreServiceDaoImpl extends BaseServiceDao implements IStoreService
         }
         return Integer.parseInt(stores.get(0).get("count").toString());
     }
+
+    /**
+     * 查询员工和商户信息表
+     *
+     * @param info
+     * @return
+     * @throws DAOException
+     */
+    @Override
+    public List<Map> getStoreUserInfo(Map info) throws DAOException {
+        List<Map> storeUserInfos = sqlSessionTemplate.selectList("storeServiceDaoImpl.getStoreUserInfo", info);
+        return storeUserInfos;
+    }
 }

service-store/src/main/java/com/java110/store/smo/impl/StoreInnerServiceSMOImpl.java

@@ -1,6 +1,7 @@
 package com.java110.store.smo.impl;
 
 import com.java110.dto.store.StoreAttrDto;
+import com.java110.dto.store.StoreUserDto;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.intf.store.IStoreInnerServiceSMO;
@@ -22,7 +23,7 @@ import java.util.List;
  * add by wuxw 2019/9/20
  **/
 @RestController
-public class StoreInnerServiceSMOImpl  extends BaseServiceSMO implements IStoreInnerServiceSMO {
+public class StoreInnerServiceSMOImpl extends BaseServiceSMO implements IStoreInnerServiceSMO {
 
     @Autowired
     private IStoreServiceDao storeServiceDaoImpl;
@@ -53,16 +54,28 @@ public class StoreInnerServiceSMOImpl  extends BaseServiceSMO implements IStoreI
         return storeDtos;
     }
 
-    public List<StoreAttrDto> getStoreAttrs(@RequestBody StoreAttrDto storeAttrDto){
+    public List<StoreAttrDto> getStoreAttrs(@RequestBody StoreAttrDto storeAttrDto) {
         List<StoreAttrDto> storeAttrDtos = BeanConvertUtil.covertBeanList(storeServiceDaoImpl.getStoreAttrs(BeanConvertUtil.beanCovertMap(storeAttrDto)), StoreAttrDto.class);
         return storeAttrDtos;
     }
 
 
-    public int getStoreCount(@RequestBody StoreDto storeDto){
+    public int getStoreCount(@RequestBody StoreDto storeDto) {
         return storeServiceDaoImpl.getStoreCount(BeanConvertUtil.beanCovertMap(storeDto));
     }
 
+    /**
+     * 查询员工和员工所属商户信息
+     *
+     * @param storeUserDto
+     * @return
+     */
+    @Override
+    public List<StoreUserDto> getStoreUserInfo(@RequestBody StoreUserDto storeUserDto) {
+        List<StoreUserDto> storeUserInfos = BeanConvertUtil.covertBeanList(storeServiceDaoImpl.getStoreUserInfo(BeanConvertUtil.beanCovertMap(storeUserDto)), StoreUserDto.class);
+        return storeUserInfos;
+    }
+
 
     public IStoreServiceDao getStoreServiceDaoImpl() {
         return storeServiceDaoImpl;