微信查询技术列表去掉了经纬度限制

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TJsController.java

@@ -224,7 +224,7 @@ public class TJsController extends BaseController {
     public R wxSelect(Page<TJs> page, TJsVo js) {
         try {
             log.info("微信查询技师列表，请求参数:{}", JSON.toJSONString(js));
-            if (js.getLatitude() != null && js.getLongitude() != null) {
+            /*if (js.getLatitude() != null && js.getLongitude() != null) {
                 // 检查经纬度是否在合理范围内
                 Location location = new Location();
                 location.setLatitude(js.getLatitude().doubleValue());
@@ -258,7 +258,7 @@ public class TJsController extends BaseController {
                     //log.info("page============>:{}", JSONUtil.toJsonStr(page));
                     return R.ok(page);
                 }
-            }
+            }*/
             return R.ok(jsService.getAll(page, js));
         } catch (Exception e) {
             // 异常处理

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -44,6 +45,16 @@ public class CouponReceiveVo{
      */
     private String couponType;
 
+    /**
+     * 有效期类型: 1-固定日期范围 2-领券后N天有效 3-长期有效 4-三方赠送
+     */
+    private String useType;
+
+    /**
+     * 开始时间
+     */
+    private Date validStartTime;
+
     /**
      * 过期时间
      */
@@ -56,4 +67,23 @@ public class CouponReceiveVo{
     @ApiModelProperty("过期时间String")
     private String expirationTimeString;
 
+    /**
+     * 门槛金额(分): 满X元生效，适用于满减/折扣
+     */
+    private BigDecimal ruleMinSpendAmount;
+
+    /**
+     * 折扣率: 如0.80表示8折，仅折扣券使用
+     */
+    private BigDecimal ruleDiscountRate;
+
+    /**
+     * 折扣封顶金额(分): 折扣最高优惠
+     */
+    private BigDecimal ruleDiscountCapAmount;
+
+    /**
+     * 满减金额(分): 仅满减券使用
+     */
+    private BigDecimal ruleReductionAmount;
 }

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

@@ -2,16 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ylx.massage.mapper.CouponReceiveMapper">
 
-    <resultMap type="com.ylx.massage.domain.vo.CouponReceiveVo" id="CouponReceiveVoMap">
+    <resultMap id="CouponReceiveVoMap" type="com.ylx.massage.domain.vo.CouponReceiveVo">
         <result property="id" column="id" jdbcType="VARCHAR"/>
         <result property="openid" column="receive_open_id" jdbcType="VARCHAR"/>
         <result property="couponId" column="coupon_id" jdbcType="VARCHAR"/>
-        <result property="expirationTime" column="expiration_time" jdbcType="TIMESTAMP"/>
-        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-        <result property="isDelete" column="is_delete" jdbcType="INTEGER"/>
         <result property="couponName" column="coupon_name" jdbcType="VARCHAR"/>
         <result property="couponType" column="coupon_type" jdbcType="INTEGER"/>
+        <result property="useType" column="use_type" jdbcType="VARCHAR"/>
+        <result property="validStartTime" column="valid_start_time" jdbcType="TIMESTAMP"/>
+        <result property="expirationTime" column="expiration_time" jdbcType="TIMESTAMP"/>
+        <result property="ruleMinSpendAmount" column="rule_min_spend_amount" jdbcType="DECIMAL"/>
+        <result property="ruleDiscountRate" column="rule_discount_rate" jdbcType="DECIMAL"/>
+        <result property="ruleDiscountCapAmount" column="rule_discount_cap_amount" jdbcType="DECIMAL"/>
+        <result property="ruleReductionAmount" column="rule_reduction_amount" jdbcType="DECIMAL"/>
     </resultMap>
 
     <sql id="selectCouponReceiveVo">