首页按摩推荐商户列表优化

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/MerchantVo.java

@@ -47,7 +47,6 @@ public class MerchantVo implements Serializable {
     /**
      * 商户开通技能时设置的最低价格
      */
-    //todo 需要查商户技能开通表
     @ApiModelProperty("最低价格")
     private BigDecimal price;
 

nightFragrance-massage/src/main/java/com/ylx/shopingfundsdetail/controller/ShoppingFundsDetailController.java

@@ -9,6 +9,7 @@ import com.ylx.shopingfundsdetail.service.ShoppingFundsDetailService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,14 +34,14 @@ public class ShoppingFundsDetailController {
 
     @ApiOperation("查询购物金明细")
     @PostMapping(value="queryShoppingFundsDetail")
-    public R<Page<ShoppingFundsDetailQueryVo>> queryShoppingFundsDetail(@RequestBody ShoppingFundsDetailQueryDto shoppingFundsDetailQueryDto) {
+    public R<Page<ShoppingFundsDetailQueryVo>> queryShoppingFundsDetail(@Validated @RequestBody ShoppingFundsDetailQueryDto shoppingFundsDetailQueryDto) {
         Page<ShoppingFundsDetailQueryVo> v =  shoppingFundsDetailService.queryShoppingFundsDetail(shoppingFundsDetailQueryDto);
         return R.ok(v);
     }
 
     @ApiOperation("新增购物金明细")
     @PostMapping(value="addShoppingFundsDetail")
-    public R<?> addShoppingFundsDetail(@RequestBody ShoppingFundsDetailAddDto dto) {
+    public R<?> addShoppingFundsDetail(@Validated  @RequestBody ShoppingFundsDetailAddDto dto) {
         shoppingFundsDetailService.addShoppingFundsDetail(dto);
         return R.ok();
     }

nightFragrance-massage/src/main/java/com/ylx/shoppingfunds/controller/MyShoppingFundsController.java

@@ -7,6 +7,7 @@ import com.ylx.shoppingfunds.domain.vo.MyShoppingFundsQueryVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -35,7 +36,7 @@ public class MyShoppingFundsController {
 
     @ApiOperation("更新购物金")
     @PostMapping(value="updateMyShoppingFunds")
-    public R<?> updateMyShoppingFunds(@RequestBody MyShoppingFundsUpdateDto myShoppingFundsUpdateDto) {
+    public R<?> updateMyShoppingFunds(@Validated  @RequestBody MyShoppingFundsUpdateDto myShoppingFundsUpdateDto) {
        wxUserService.updateMyShoppingFunds(myShoppingFundsUpdateDto.getWxUserId(), myShoppingFundsUpdateDto.getAmount(), myShoppingFundsUpdateDto.getExpenseType());
         return R.ok();
     }

nightFragrance-massage/src/main/resources/mapper/massage/MaTechnicianMapper.xml

@@ -126,13 +126,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-     <!-- todo p.price最低-->
+     <!-- 首页按摩商户推荐列表-->
     <select id="getMerchantRecommend" resultType="com.ylx.massage.domain.vo.MerchantVo">
         SELECT
         t.id AS merchantId,
         t.te_name AS teName,
         t.n_star AS nStar,
         t.n_num AS nNum,
+        p.price AS price,
         ST_Distance_Sphere(
         POINT(a.longitude, a.latitude),
         POINT(#{dto.longitude}, #{dto.latitude})
@@ -143,6 +144,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             SELECT p.user_id AS user_id ,
                    p.project_current_price AS  price
             FROM ma_project p
+            WHERE p.is_delete = 0
+            ORDER BY p.project_current_price ASC
+            LIMIT 1
         ) p ON t.id = p.user_d
 
         WHERE