123

ace-modules/ace-admin/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -24,7 +24,11 @@
     <select id="search" parameterType="com.github.wxiaoqi.security.admin.dto.CompanySearchDTO" resultType="com.github.wxiaoqi.security.admin.vo.CompanySearchVO">
         select c.*,i.name as companyName,l.name as levelName
         <if test="lon != null and lat != null">
-            , st_distance_sphere(point(#{lon}, #{lat}), point(c.longitude, c.latitude)) as distance
+            , ROUND(( (2 * ASIN( SQRT( POW( SIN((latitude * PI() / 180.0
+            -${lat} * PI() / 180.0)/2), 2)
+            +COS( latitude * PI() / 180.0)*COS(${lat} * PI() / 180.0)
+            *POW(SIN((longitude * PI() / 180.0 - ${lon} * PI() /
+            180.0)/2),2))))*6378.137)*10000)/10000 as distance
         </if>
         from branch_company c
         LEFT JOIN  company_info i on  c.company_id=i.id
@@ -76,7 +80,7 @@
         </where>
         <choose>
             <when test="lon != null and lat != null">
-                order by c.distance asc
+                order by distance asc
             </when>
             <otherwise>
                 order by c.id desc

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/CouponBiz.java

@@ -155,4 +155,25 @@ public class CouponBiz extends BaseBiz<CouponMapper, Coupon> {
        }
        return couponDTOS;
     }
+
+
+    public List<Coupon>  getList(CouponFindDTO couponFindDTO){
+        Example example = new Example(Coupon.class);
+        Example.Criteria criteria = example.createCriteria();
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(couponFindDTO.getTitle())){
+            criteria.andLike("title",String.format("%%%s%%",couponFindDTO.getTitle()));
+        }
+        if (Objects.nonNull(couponFindDTO.getChannel())){
+            criteria.andEqualTo("channel",couponFindDTO.getChannel());
+        }
+        if (Objects.nonNull(couponFindDTO.getType())){
+            criteria.andEqualTo("type",couponFindDTO.getType());
+        }
+        if (Objects.nonNull(couponFindDTO.getStatus())){
+            criteria.andEqualTo("status",couponFindDTO.getStatus());
+        }
+        criteria.andEqualTo("isDel",0);
+        example.setOrderByClause("crt_time DESC");
+        return   mapper.selectByExample(example);
+    }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/admin/CouponAdminController.java

@@ -9,6 +9,7 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.activity.biz.CouponBiz;
 import com.xxfc.platform.activity.dto.CouponDTO;
 import com.xxfc.platform.activity.dto.CouponFindDTO;
+import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.vo.CouponPagVo;
 import com.xxfc.platform.activity.vo.CouponTitleVo;
 import com.xxfc.platform.activity.vo.CouponVo;
@@ -95,4 +96,11 @@ public class CouponAdminController implements UserRestInterface {
 
         return false;
     }
+
+
+    @ApiOperation("优惠券列表")
+    @GetMapping("/getList")
+    public ObjectRestResponse<List<Coupon>> getList(CouponFindDTO couponFindDTO) {
+        return ObjectRestResponse.succ(couponBiz.getList(couponFindDTO));
+    }
 }