Merge remote-tracking branch 'origin/master'

doum

2 天以前 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java

@@ -146,6 +146,8 @@
        shop.setIsrec(Constants.ONE);
        shop.setOrigin(Constants.ONE);
        shop.setSaleType(Constants.formatIntegerNum(shop.getSaleType()));
        shop.setAmount(BigDecimal.ZERO);
        shop.setTotalAmount(BigDecimal.ZERO);
        String salt = RandomStringUtils.randomAlphabetic(6);

        shop.setPassword(shop.getCode()+"@123456");
@@ -712,7 +714,9 @@
                .selectAll(Shop.class)
                .select(" CONVERT( ST_Distance_Sphere ( POINT ( LONGITUDE, LATITUDE ), POINT ( '"+dto.getLgt()+"' , '"+dto.getLat()+"' )) /1000,DECIMAL(15,2))",Shop::getDistance)
                .leftJoin(SystemUser.class,SystemUser::getId,Shop::getCreator)
                .like(StringUtils.isNotBlank(dto.getCityName()),Shop::getAddr,dto.getCityName())
                .leftJoin("areas a1 on a1.id=t.area_id")
                .leftJoin("areas a2 on a2.id=a1.parent_id")
                .like(StringUtils.isNotBlank(dto.getCityName()),"a2.name",dto.getCityName())
                .like(StringUtils.isNotBlank(dto.getShopName()),Shop::getName,dto.getShopName())
                .orderByDesc(!isArea,Shop::getId)
                .orderByAsc(isArea," distance ")