Explorar el Código

子商户列表名字模糊查询

release_toaliyun_real
lrh hace 2 años
padre
commit
c1f26a2268
Se han modificado 5 ficheros con 10 adiciones y 9 borrados
  1. +3
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +1
    -4
      mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  5. +3
    -0
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 3
- 2
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Ver fichero

@@ -131,10 +131,11 @@ public class WxMerchantController extends BaseController {


@ApiOperation("子商户列表查询") @ApiOperation("子商户列表查询")
@GetMapping("/subMerchantList") @GetMapping("/subMerchantList")
@ApiImplicitParam(name = "subName", value = "subName", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "子商户列表查询") @SystemControllerLog(description = "子商户列表查询")
public ResultData subMerchantList() {
public ResultData subMerchantList(String subName) {
logger.debug("[" + getIpAddr() + "] WxMerchantController::subMerchantList"); logger.debug("[" + getIpAddr() + "] WxMerchantController::subMerchantList");
List<WxMerchant> merchants = wxMerchantService.subMerchantList();
List<WxMerchant> merchants = wxMerchantService.subMerchantList(subName);
return new ResultData(merchants); return new ResultData(merchants);
} }




+ 1
- 4
mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java Ver fichero

@@ -4,9 +4,6 @@ import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.dto.WxMerchantDto;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxMerchantTradeDetailVo;
import com.iformall.domain.vo.WxMerchantTradeVo;
import com.iformall.domain.vo.WxMerchantVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;


import java.util.HashMap; import java.util.HashMap;
@@ -61,5 +58,5 @@ public interface WxMerchantMapper extends CommonMapper<WxMerchant, Long> {


List<WxMerchant> getMerchantListByIds(@Param("relationIds") List<Long> relationIds); List<WxMerchant> getMerchantListByIds(@Param("relationIds") List<Long> relationIds);


List<WxMerchant> getSubMerchantListByIds(@Param("merchantIds") List<Long> merchantIds);
List<WxMerchant> getSubMerchantListByIds(@Param("merchantIds") List<Long> merchantIds,@Param("subName") String subName);
} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxMerchantService.java Ver fichero

@@ -218,6 +218,6 @@ public interface WxMerchantService {


List<WxMerchant> relationList(Long regionId); List<WxMerchant> relationList(Long regionId);


List<WxMerchant> subMerchantList();
List<WxMerchant> subMerchantList(String subName);


} }

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Ver fichero

@@ -2076,9 +2076,9 @@ public class WxMerchantServiceImpl implements WxMerchantService {
* 查询剩余子商户 * 查询剩余子商户
*/ */
@Override @Override
public List<WxMerchant> subMerchantList() {
public List<WxMerchant> subMerchantList(String subName) {
//查询已经被选择了的子商户 //查询已经被选择了的子商户
List<Long> merchantIds = wxMerchantRelationService.getRelationByRegionId(null); List<Long> merchantIds = wxMerchantRelationService.getRelationByRegionId(null);
return wxMerchantMapper.getSubMerchantListByIds(merchantIds);
return wxMerchantMapper.getSubMerchantListByIds(merchantIds,subName);
} }
} }

+ 3
- 0
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Ver fichero

@@ -472,6 +472,9 @@
#{idItem} #{idItem}
</foreach> </foreach>
</if> </if>
<if test="subName != null and subName != ''">
and name like concat('%',#{subName},'%')
</if>
</select> </select>


</mapper> </mapper>

Cargando…
Cancelar
Guardar