feats

deploy/bootstrap

@@ -2,6 +2,6 @@
 #
 #
 
-appVer="2.0.0"
+appVer="3.0.2"
 
 java -jar ./shigongli-${appVer}.jar

deploy/template.yml

@@ -11,7 +11,7 @@ Resources:
       Properties:
         Handler: com.yunzhi.shigongli.SpringApplication::main
         Runtime: custom
-        CodeUri: 'oss://yz-serverless/shigongli/shigongli-2.0.0.zip'
+        CodeUri: 'oss://yz-serverless/shigongli/shigongli-3.0.2.zip'
         MemorySize: 1024
         Timeout: 30
         InitializationTimeout: 30

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>shigongli</artifactId>
-	<version>3.0.1</version>
+	<version>3.0.2</version>
 	<name>shigongli</name>
 	<description>Shi Gong Li</description>
 

src/main/java/com/yunzhi/shigongli/common/WxPayUtils.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 
 @Component
 public class WxPayUtils {
@@ -32,7 +33,8 @@ public class WxPayUtils {
      * @throws Exception
      */
     public WxPayMpOrderResult createOrder(TaPerson person, TaOrderPay orderPay) throws Exception {
-        LocalDateTime now = LocalDateTime.now();
+        // 北京时间
+        LocalDateTime now = LocalDateTime.now(ZoneOffset.ofHours(8));
         WxPayService payService = wxUtils.getPayService();
 
         WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();

src/main/java/com/yunzhi/shigongli/config/CorsConfig.java

@@ -0,0 +1,25 @@
+package com.yunzhi.shigongli.config;
+
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@SpringBootConfiguration
+public class CorsConfig implements WebMvcConfigurer {
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        //添加映射路径
+        registry.addMapping("/**")
+                //是否发送Cookie
+                .allowCredentials(true)
+                //设置放行哪些原始域
+                .allowedOrigins("*")
+                //放行哪些请求方式
+                .allowedMethods("GET", "POST", "PUT", "DELETE")
+                //.allowedMethods("*") //或者放行全部
+                //放行哪些原始请求头部信息
+                .allowedHeaders("*")
+                //暴露哪些原始请求头部信息
+                .exposedHeaders("X-Authorization-JWT");
+    }
+}

src/main/java/com/yunzhi/shigongli/controller/TaTravelController.java

@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.*;
 import com.yunzhi.shigongli.entity.TaPerson;
 import com.yunzhi.shigongli.entity.TaTravel;
-import com.yunzhi.shigongli.entity.TaTravelItem;
 import com.yunzhi.shigongli.entity.TaTravelPerson;
-import com.yunzhi.shigongli.service.ITaPvService;
 import com.yunzhi.shigongli.service.ITaTravelItemService;
 import com.yunzhi.shigongli.service.ITaTravelPersonService;
 import com.yunzhi.shigongli.service.ITaTravelService;
@@ -17,7 +15,6 @@ import com.yunzhi.shigongli.vo.TravelListVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.ibatis.annotations.Delete;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -25,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -102,6 +98,52 @@ public class TaTravelController extends BaseController {
     }
 
 
+    /**
+     * 删除行程
+     * @return
+     * @throws Exception
+     */
+    @DeleteMapping("/admin/travel/{id}")
+    @ApiOperation(value="删除行程", notes = "行程详情", httpMethod = "DELETE", response = TravelDataVO.class)
+    public ResponseBean deleteTravel(@ApiParam("行程ID") @PathVariable String id) throws Exception {
+        TaTravel taTravel = iTaTravelService.getById(id);
+        if (null == taTravel || taTravel.getStatus() == Constants.STATUS_DELETED) {
+            return ResponseBean.error("没有找到行程信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        iTaTravelService.removeLogicById(id);
+
+        return ResponseBean.success(null);
+    }
+
+
+    /**
+     * 行程发布/取消发布
+     * @return
+     * @throws Exception
+     */
+    @PutMapping("/admin/travel/{id}/publish/{status}")
+    @ApiOperation(value="行程发布/取消发布", notes = "行程发布/取消发布", httpMethod = "PUT", response = TravelDataVO.class)
+    public ResponseBean publishTravel(@ApiParam("行程ID") @PathVariable String id,
+                                      @ApiParam(value = "发布状态", allowableValues = "on,off") @PathVariable String status) throws Exception {
+        TaTravel taTravel = iTaTravelService.getById(id);
+        if (null == taTravel || taTravel.getStatus() == Constants.STATUS_DELETED) {
+            return ResponseBean.error("没有找到行程信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if ("on".equals(status.toLowerCase())) {
+            taTravel.setStatus(Constants.STATUS_NORMAL);
+        } else {
+            taTravel.setStatus(Constants.STATUS_READY);
+        }
+
+        if (iTaTravelService.updateById(taTravel)) {
+            return ResponseBean.success(null);
+        } else {
+            return ResponseBean.error("操作失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 行程详情
      * @return
@@ -118,7 +160,7 @@ public class TaTravelController extends BaseController {
         TravelDataVO travelDataVO = new TravelDataVO();
         BeanUtils.copyProperties(taTravel, travelDataVO);
 
-        List<TravelItemDataVO> travelItemDetails = iTaTravelItemService.getTravelItemDetails(id);
+        List<TravelItemDataVO> travelItemDetails = iTaTravelItemService.getTravelItemDetails(id, null);
         travelDataVO.setTravelItemList(travelItemDetails);
 
         return ResponseBean.success(travelDataVO);
@@ -139,7 +181,7 @@ public class TaTravelController extends BaseController {
             return ResponseBean.success(null);
         }
 
-        List<TravelItemDataVO> itemDataVOList = iTaTravelItemService.getTravelItemDetails(travelData.getTravelId());
+        List<TravelItemDataVO> itemDataVOList = iTaTravelItemService.getTravelItemDetails(travelData.getTravelId(), taPerson.getPersonId());
 
         travelData.setTravelItemList(itemDataVOList);
 
@@ -160,7 +202,7 @@ public class TaTravelController extends BaseController {
         TravelDataVO travelDataVO = new TravelDataVO();
         BeanUtils.copyProperties(travel, travelDataVO);
 
-        List<TravelItemDataVO> itemDataVOList = iTaTravelItemService.getTravelItemDetails(travel.getTravelId());
+        List<TravelItemDataVO> itemDataVOList = iTaTravelItemService.getTravelItemDetails(travel.getTravelId(), taPerson.getPersonId());
 
         travelDataVO.setTravelItemList(itemDataVOList);
 
@@ -331,7 +373,7 @@ public class TaTravelController extends BaseController {
      */
     @PutMapping("/wx/travel/{id}")
     @ApiOperation(value="更新我的行程", notes = "更新我的行程", httpMethod = "PUT", response = TaTravel.class)
-    public ResponseBean updateTravel(@ApiParam("行程ID") @PathVariable String id,
+    public ResponseBean updateMyTravel(@ApiParam("行程ID") @PathVariable String id,
                                      @ApiParam("保存内容") @RequestBody TaTravel taTravel) throws Exception {
         TaTravelPerson taTravelPerson = iTaTravelPersonService.getByPerson(getCurrentPerson().getPersonId(), id);
         if (null == taTravelPerson) {
@@ -359,7 +401,7 @@ public class TaTravelController extends BaseController {
      */
     @DeleteMapping("/wx/travel/{id}")
     @ApiOperation(value="删除我的行程", notes = "删除我的行程", httpMethod = "DELETE", response = TaTravel.class)
-    public ResponseBean deleteTravel(@ApiParam("行程ID") @PathVariable String id) throws Exception {
+    public ResponseBean deleteMyTravel(@ApiParam("行程ID") @PathVariable String id) throws Exception {
         TaTravelPerson taTravelPerson = iTaTravelPersonService.getByPerson(getCurrentPerson().getPersonId(), id);
         if (null == taTravelPerson) {
             return ResponseBean.error("未找到删除内容", ResponseBean.ERROR_UNAVAILABLE);
@@ -386,7 +428,8 @@ public class TaTravelController extends BaseController {
     @GetMapping("/wx/travel/{id}")
     @ApiOperation(value="我的行程详情", notes = "我的行程详情", httpMethod = "GET", response = TaTravel.class)
     public ResponseBean getMineTravel(@ApiParam("行程ID") @PathVariable String id) throws Exception {
-        TaTravelPerson taTravelPerson = iTaTravelPersonService.getByPerson(getCurrentPerson().getPersonId(), id);
+        String personId = getCurrentPerson().getPersonId();
+        TaTravelPerson taTravelPerson = iTaTravelPersonService.getByPerson(personId, id);
         if (null == taTravelPerson) {
             return ResponseBean.error("未找到行程内容", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -399,7 +442,7 @@ public class TaTravelController extends BaseController {
         TravelDataVO travelDataVO = new TravelDataVO();
         BeanUtils.copyProperties(origin, travelDataVO);
 
-        List<TravelItemDataVO> travelItemDetails = iTaTravelItemService.getTravelItemDetails(id);
+        List<TravelItemDataVO> travelItemDetails = iTaTravelItemService.getTravelItemDetails(id, personId);
         travelDataVO.setTravelItemList(travelItemDetails);
 
         return ResponseBean.success(travelDataVO);

src/main/java/com/yunzhi/shigongli/mapper/TaTravelItemMapper.java

@@ -21,7 +21,7 @@ public interface TaTravelItemMapper extends BaseMapper<TaTravelItem> {
 
     int copyTravelItems(@Param("srcId") String srcId, @Param("targId") String targId);
 
-    List<TravelItemDataVO> getTravelItemDetails(@Param("travelId") String travelId);
+    List<TravelItemDataVO> getTravelItemDetails(@Param("travelId") String travelId, @Param("personId") String personId);
 
     Integer getMaxNoOf(@Param("travelId") String travelId, @Param("dayOrder") Integer dayOrder);
 }

src/main/java/com/yunzhi/shigongli/service/ITaTravelItemService.java

@@ -18,7 +18,7 @@ public interface ITaTravelItemService extends IBaseService<TaTravelItem> {
 
     Integer getMaxNoOf(String travelId, Integer dayOrder);
 
-    List<TravelItemDataVO> getTravelItemDetails(String travelId);
+    List<TravelItemDataVO> getTravelItemDetails(String travelId, String personId);
 
     List<TravelItemDataVO> updateTravelItems(String travelId, List<TravelItemDataVO> travelItemList) throws Exception;
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaTravelItemServiceImpl.java

@@ -1,7 +1,6 @@
 package com.yunzhi.shigongli.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yunzhi.shigongli.entity.TaTravel;
 import com.yunzhi.shigongli.entity.TaTravelItem;
 import com.yunzhi.shigongli.mapper.TaTravelItemMapper;
 import com.yunzhi.shigongli.mapper.TaTravelMapper;
@@ -33,8 +32,8 @@ public class TaTravelItemServiceImpl extends BaseServiceImpl<TaTravelItemMapper,
     }
 
     @Override
-    public List<TravelItemDataVO> getTravelItemDetails(String travelId) {
-        return baseMapper.getTravelItemDetails(travelId);
+    public List<TravelItemDataVO> getTravelItemDetails(String travelId, String personId) {
+        return baseMapper.getTravelItemDetails(travelId, personId);
     }
 
     /**
@@ -69,6 +68,6 @@ public class TaTravelItemServiceImpl extends BaseServiceImpl<TaTravelItemMapper,
         // 保存明细
         saveBatch(travelItems);
 
-        return getTravelItemDetails(travelId);
+        return getTravelItemDetails(travelId, null);
     }
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaTravelServiceImpl.java

@@ -37,7 +37,7 @@ public class TaTravelServiceImpl extends BaseServiceImpl<TaTravelMapper, TaTrave
         }
 
         TravelDataVO travelDataVO = travelDataVOList.get(0);
-        List<TravelItemDataVO> itemDataVOList = taTravelItemMapper.getTravelItemDetails(travelId);
+        List<TravelItemDataVO> itemDataVOList = taTravelItemMapper.getTravelItemDetails(travelId, personId);
         travelDataVO.setTravelItemList(itemDataVOList);
 
         return travelDataVO;
@@ -49,7 +49,7 @@ public class TaTravelServiceImpl extends BaseServiceImpl<TaTravelMapper, TaTrave
         if (simple || null == travelDataVOPage || null == travelDataVOPage.getRecords()) return travelDataVOPage;
 
         for (TravelDataVO travelDataVO : travelDataVOPage.getRecords()) {
-            List<TravelItemDataVO> itemDataVOList = taTravelItemMapper.getTravelItemDetails(travelDataVO.getTravelId());
+            List<TravelItemDataVO> itemDataVOList = taTravelItemMapper.getTravelItemDetails(travelDataVO.getTravelId(), personId);
             travelDataVO.setTravelItemList(itemDataVOList);
         }
 

src/main/java/com/yunzhi/shigongli/vo/TravelItemDataVO.java

@@ -66,4 +66,7 @@ public class TravelItemDataVO {
 
     @ApiModelProperty(value = "区位父级名称")
     private String areaPName;
+
+    @ApiModelProperty(value = "是否收藏")
+    private Integer isSaved;
 }

src/main/resources/application-prod.yml

@@ -25,6 +25,6 @@ weixin:
     mchKey: fUbYPldU5bUCYRl97vMv69JQujsJ8dj5
     subAppId:
     subMchId:
-    keyPath: /opt/yunzhi/sgl-v2/cert/apiclient_cert.p12
+    keyPath: classpath:/cert/apiclient_cert.p12
     notifyUrl: https://sgl-v2.njyunzhi.com/api/wxpay/notify/order
     refundNotifyUrl: https://sgl-v2.njyunzhi.com/api/wxpay/notify/refund

src/main/resources/application.yml

@@ -66,7 +66,7 @@ weixin:
     mchKey: fUbYPldU5bUCYRl97vMv69JQujsJ8dj5
     subAppId:
     subMchId:
-    keyPath: E:/work/shigongli/v2/service/cert/apiclient_cert.p12
+    keyPath: classpath:/cert/apiclient_cert.p12
     notifyUrl: https://sgl-v2-test.njyunzhi.com/api/wxpay/notify/order
     refundNotifyUrl: https://sgl-v2-test.njyunzhi.com/api/wxpay/notify/refund
 

src/main/resources/mapper/TaNoteResourceMapper.xml

@@ -7,9 +7,11 @@
             s.*,
             <if test="personId != null and personId != ''">
                 IFNULL(m.visited_num, 0) as is_visited,
+                IFNULL(n.saved_num, 0) as is_saved,
             </if>
             <if test="personId == null or personId == ''">
                 0 as is_visited,
+                0 as is_saved,
             </if>
             c.area_name,
             d.area_id,
@@ -33,6 +35,20 @@
                         b.target_id
                 ) m ON m.target_type = s.target_type
                     AND m.target_id = s.target_id
+                LEFT JOIN (
+                    SELECT
+                        a.target_type,
+                        a.target_id,
+                        count( 1 ) AS saved_num
+                    FROM
+                        ta_save a
+                    WHERE
+                        a.person_id = #{personId}
+                    GROUP BY
+                        a.target_type,
+                        a.target_id
+                    ) n ON n.target_type = s.target_type
+                        AND n.target_id = s.target_id
                 </if>
                 LEFT JOIN td_city c ON c.area_id = s.city_id
                 LEFT JOIN td_city d ON d.area_id = c.area_p_id

src/main/resources/mapper/TaTravelItemMapper.xml

@@ -31,6 +31,9 @@
             s.weight,
             s.city_id,
             s.save_num,
+            <if test="personId != null and personId != ''">
+                IFNULL(n.saved_num, 0) as is_saved,
+            </if>
             s.target_name,
             c.area_name,
             d.area_id,
@@ -41,6 +44,22 @@
                     AND s.target_id = t.target_id
                 LEFT JOIN td_city c ON c.area_id = s.city_id
                 LEFT JOIN td_city d ON d.area_id = c.area_p_id
+            <if test="personId != null and personId != ''">
+                LEFT JOIN (
+                    SELECT
+                        a.target_type,
+                        a.target_id,
+                        count( 1 ) AS saved_num
+                    FROM
+                        ta_save a
+                    WHERE
+                        a.person_id = #{personId}
+                    GROUP BY
+                        a.target_type,
+                        a.target_id
+                    ) n ON n.target_type = s.target_type
+                        AND n.target_id = s.target_id
+            </if>
         WHERE
             t.travel_id = #{travelId}
           AND s.`status` &gt; -1

src/main/resources/mapper/TaTravelPersonMapper.xml

@@ -14,5 +14,6 @@
         WHERE
             s.person_id = #{personId}
           AND t.is_destiny = 1
+          AND t.status > -1
     </select>
 </mapper>