feats

pom.xml

@@ -10,9 +10,9 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>shigongli</artifactId>
-	<version>0.0.1</version>
+	<version>2.0.0</version>
 	<name>shigongli</name>
-	<description>Demo project for Spring Boot</description>
+	<description>Shi Gong Li</description>
 
 	<properties>
 		<java.version>1.8</java.version>
@@ -116,6 +116,14 @@
 		</dependency>
 		<!--excel end-->
 
+		<!--image thumbnailator start-->
+		<dependency>
+			<groupId>net.coobird</groupId>
+			<artifactId>thumbnailator</artifactId>
+			<version>[0.4, 0.5)</version>
+		</dependency>
+		<!--image thumbnailator end-->
+
 		<!--weixin-miniapp start-->
 		<dependency>
 			<groupId>com.github.binarywang</groupId>

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

@@ -1,5 +1,6 @@
 package com.yunzhi.shigongli.common;
 
+import java.time.DayOfWeek;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -19,4 +20,11 @@ public class DateUtils {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(formater);
         return dt.format(formatter);
     }
+
+    public static String weekDay(LocalDateTime dt) {
+        String[] week = new String[]{"一", "二", "三", "四", "五", "六", "日"};
+        DayOfWeek dayOfWeek = dt.getDayOfWeek();
+        int inx = dayOfWeek.getValue() - 1;
+        return String.format("星期%s", week[inx]);
+    }
 }

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

@@ -0,0 +1,105 @@
+package com.yunzhi.shigongli.common;
+
+import com.yunzhi.shigongli.vo.AMapWeather;
+import net.coobird.thumbnailator.Thumbnails;
+import net.coobird.thumbnailator.filters.Caption;
+import net.coobird.thumbnailator.geometry.Coordinate;
+import net.coobird.thumbnailator.geometry.Positions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.time.LocalDateTime;
+
+@Component
+public class ImageUtils {
+
+    @Autowired
+    OSSUtils ossUtils;
+
+    public String renderWeatherPic(AMapWeather.Live weather, String backImageUrl) throws IOException {
+        LocalDateTime now = LocalDateTime.now();
+        String area = weather.getAdcode();
+        String nmDate = DateUtils.toString(LocalDateTime.now(), "yyyyMMddHHmm");
+        String fname = String.format("weather-%s-%s.jpg", area, nmDate);
+
+        // 颜色
+        Color color = Color.white;
+
+        // 字体
+        String fontName = "Microsoft YaHei";
+
+        // 城市
+        Font font1 = new Font(fontName, Font.BOLD, 40);
+        Caption city = new Caption(weather.getCity(), font1, color, new Coordinate(124, 272 + 20), 0); // + 20 为字体大小的一半
+
+        // 天气现象
+        Font font2 = new Font(fontName, Font.BOLD, 40);
+        Caption wthName = new Caption(weather.getWeather(), font2, color, new Coordinate(378, 190 + 20), 0);
+
+        // 温度
+        Font font3 = new Font(fontName, Font.BOLD, 130);
+        Caption temperature = new Caption(weather.getTemperature() + "℃", font3, color, new Coordinate(84, 118 + 50), 0);
+
+        // 湿度
+        Font font4 = new Font(fontName, Font.BOLD, 32);
+        int y4 = 540 + 30;
+        Caption humidity = new Caption(weather.getHumidity() + "%", font4, color, new Coordinate(338, y4), 0);
+
+        // 风向
+        String wind = weather.getWinddirection() + "风 " + weather.getWindpower() + "级";
+        Caption winddirection = new Caption(wind, font4, color, new Coordinate(78, y4), 0);
+
+        // 日期
+        String dateStr = DateUtils.toString(now, "MM/dd");
+        String week = DateUtils.weekDay(now);
+        Caption date = new Caption(dateStr + " " + week, font4, color, new Coordinate(500, y4), 0);
+
+        // 绘制图片
+        PipedInputStream inputStream = new PipedInputStream();
+        PipedOutputStream out = new PipedOutputStream(inputStream);
+
+        new Thread(new Runnable() {
+            public void run () {
+                try {
+                    Thumbnails.of(new URL(backImageUrl))
+                            .crop(Positions.CENTER)
+                            .size(760, 600)
+                            .addFilter(city)
+                            .addFilter(wthName)
+                            .addFilter(temperature)
+                            .addFilter(humidity)
+                            .addFilter(winddirection)
+                            .addFilter(date)
+                            .outputQuality(0.92)
+                            .imageType(BufferedImage.TYPE_INT_ARGB)     // 预防 PNG 变黑的 BUG
+                            .toOutputStream(out);
+                }
+                catch (IOException e) {
+                    e.printStackTrace();
+                }
+                finally {
+                    try {
+                        out.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }).start();
+
+        String image = ossUtils.putObject(inputStream, fname);
+        inputStream.close();
+
+        return image;
+    }
+
+
+}

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

@@ -69,6 +69,13 @@ public class OSSUtils {
         return putFile(nwFName, inputStream);
     }
 
+    public String putObject(InputStream inputStream, String fName, String ... toDirs) {
+        String toDir = getUploadPath(toDirs);
+        String nwFName = toDir + fName;
+        nwFName = StringUtils.trim(nwFName,"/");
+        return putFile(nwFName, inputStream);
+    }
+
     private String formatFileName(String fName) {
         return StringUtils.ifNull(fName, StringUtils.random(16) + ".png");
     }
@@ -129,4 +136,5 @@ public class OSSUtils {
             throw new Exception(e.getMessage());
         }
     }
+
 }

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

@@ -0,0 +1,49 @@
+package com.yunzhi.shigongli.common;
+
+import com.yunzhi.shigongli.vo.AMapWeather;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+@Slf4j
+@Component
+public class Weather {
+
+    @Value("${amap.weather.api}")
+    String api;
+
+    public AMapWeather getWeather(String areaId) throws Exception {
+        RestTemplate restTemplate = new RestTemplate();
+
+        String url = String.format(api, areaId);
+
+        log.debug("请求高德天气接口: {}", url);
+
+        ResponseEntity<AMapWeather> response = restTemplate.exchange(url, HttpMethod.GET, null, AMapWeather.class);
+        if (null == response) {
+            throw new Exception("请求天气接口异常");
+        }
+
+        HttpStatus statusCode = response.getStatusCode();
+        boolean isSuccessful = statusCode.is2xxSuccessful();
+        if (!isSuccessful) {
+            log.error("请求天气接口[{}]出错, [{}]", url, statusCode.toString());
+            throw new Exception("请求天气接口失败: " + statusCode.getReasonPhrase());
+        }
+
+        AMapWeather result = response.getBody();
+
+        log.debug("高德天气接口返回: {}", result.toString());
+
+        if (!"1".equals(result.getStatus())) {
+            log.error("高德天气接口错误: {}", result.toString());
+            throw new Exception("请求天气接口错误: " + result.getInfocode());
+        }
+
+        return result;
+    }
+}

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

@@ -105,13 +105,13 @@ public class TaHotelController extends BaseController {
     public ResponseBean taHotelUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaHotel taHotel) throws Exception{
 
-        boolean exists = iTaHotelService.isExisted(TaHotel::getHotelName,
-                taHotel.getHotelName(),
-                TaHotel::getHotelId,
-                taHotel.getHotelId());
-        if (exists) {
-            return ResponseBean.error("民宿名称已存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
+//        boolean exists = iTaHotelService.isExisted(TaHotel::getHotelName,
+//                taHotel.getHotelName(),
+//                TaHotel::getHotelId,
+//                taHotel.getHotelId());
+//        if (exists) {
+//            return ResponseBean.error("民宿名称已存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+//        }
 
         if (iTaHotelService.updateById(taHotel)){
             return ResponseBean.success(iTaHotelService.getById(id));
@@ -129,4 +129,15 @@ public class TaHotelController extends BaseController {
     public ResponseBean taHotelGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaHotelService.getById(id));
     }
+
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/wx/hotel/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getWxDetail(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTaHotelService.getById(id));
+    }
 }

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

@@ -47,10 +47,9 @@ public class TaOrderSubController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/{plat}/taOrderSub",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taOrderSub",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taOrderSubList(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
-                                       @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean taOrderSubList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
 		    IPage<TaOrderSub> pg = new Page<>(pageNum, pageSize);
@@ -172,4 +171,12 @@ public class TaOrderSubController extends BaseController {
 //    public ResponseBean taOrderSubGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
 //        return ResponseBean.success(iTaOrderSubService.getById(id));
 //    }
+
+    @GetMapping("/wx/orderSub")
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = TaOrderSub.class)
+    public ResponseBean getWxMyOrders(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                      @ApiParam("状态") @RequestParam(value ="status", required = false) Integer status) {
+        return ResponseBean.success(null);
+    }
 }

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

@@ -3,22 +3,24 @@ package com.yunzhi.shigongli.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yunzhi.shigongli.common.BaseController;
-import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.common.*;
+import com.yunzhi.shigongli.entity.TaHotel;
+import com.yunzhi.shigongli.entity.TaRoom;
+import com.yunzhi.shigongli.service.ITaHotelService;
+import com.yunzhi.shigongli.service.ITaRoomService;
+import com.yunzhi.shigongli.vo.AMapWeather;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
 import com.yunzhi.shigongli.service.ITaRoomOrderService;
 import com.yunzhi.shigongli.entity.TaRoomOrder;
-import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -39,6 +41,20 @@ public class TaRoomOrderController extends BaseController {
     @Autowired
     public ITaRoomOrderService iTaRoomOrderService;
 
+    @Autowired
+    public ITaRoomService iTaRoomService;
+
+    @Autowired
+    public ITaHotelService iTaHotelService;
+
+    @Autowired
+    public Weather weatherUtil;
+
+    @Autowired
+    public ImageUtils imageUtils;
+
+    @Value("${amap.weather.backImage}")
+    private String backImage;
 
     /**
      * 分页查询列表
@@ -64,11 +80,35 @@ public class TaRoomOrderController extends BaseController {
      * @param taRoomOrder 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taRoomOrder",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taRoomOrderAdd(@ApiParam("保存内容") @RequestBody TaRoomOrder taRoomOrder) throws Exception{
+    @RequestMapping(value="/wx/roomOrder",method= RequestMethod.POST)
+    @ApiOperation(value="房源订单", notes = "房源订单", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taRoomOrderAdd(@ApiParam("房源订单") @RequestBody TaRoomOrder taRoomOrder) throws Exception{
+
+        String roomId = taRoomOrder.getRoomId();
+        if (StringUtils.isEmpty(roomId)) {
+            return ResponseBean.error("房源不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        TaRoom taRoom = iTaRoomService.getById(roomId);
+        if (null == taRoom || !Constants.STATUS_NORMAL.equals(taRoom.getStatus())) {
+            return ResponseBean.error("房源不存在或者状态异常", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+//        TaHotel taHotel = iTaHotelService.getById(taRoom.getHotelId());
+//        if (null == taHotel || !Constants.STATUS_NORMAL.equals(taHotel.getStatus())) {
+//            return ResponseBean.error("民宿不存在或者状态异常", ResponseBean.ERROR_ILLEGAL_PARAMS);
+//        }
+
+        // 地区暂时是南京市秦淮区
+        AMapWeather weather = weatherUtil.getWeather("320104");
+        AMapWeather.Live live = weather.getLives().get(0);
+        String image = imageUtils.renderWeatherPic(live, String.format(backImage, "晴"));
+
+        taRoomOrder.setHotelId(taRoom.getHotelId());
+        taRoomOrder.setSharePerson(getCurrentPerson().getPersonId());
+        taRoomOrder.setStatus(Constants.STATUS_READY);
+        taRoomOrder.setCreateDate(LocalDateTime.now());
 
         if (iTaRoomOrderService.save(taRoomOrder)){
+            taRoomOrder.setShareImage(image);
             return ResponseBean.success(taRoomOrder);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -116,4 +156,13 @@ public class TaRoomOrderController extends BaseController {
 //    public ResponseBean taRoomOrderGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
 //        return ResponseBean.success(iTaRoomOrderService.getById(id));
 //    }
+
+    @GetMapping("/test-weather")
+    public ResponseBean testWeather() throws Exception {
+        AMapWeather weather = weatherUtil.getWeather("320105");
+
+        String image = imageUtils.renderWeatherPic(weather.getLives().get(0), "https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/weather/background_%E6%99%B4.png");
+
+        return ResponseBean.success(image);
+    }
 }

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

@@ -130,6 +130,55 @@ public class TaShopController extends BaseController {
         }
     }
 
+
+    /**
+     * 商铺营业
+     * @param id  实体ID
+     * @return
+     */
+    @RequestMapping(value="/admin/taShop/{id}/on",method= RequestMethod.PUT)
+    @ApiOperation(value="商铺营业", notes = "商铺营业", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean publish(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+
+        TaShop taShop = iTaShopService.getById(id);
+        taShop.setStatus(Constants.STATUS_NORMAL);
+
+        if (iTaShopService.updateById(taShop)){
+            TaResource taResource = taResourceService.getByTarget(Constants.TARGET_SHOP, id);
+            taResource.setStatus(taShop.getStatus());
+            taResourceService.updateById(taResource);
+
+            return ResponseBean.success(taShop);
+        }else {
+            return ResponseBean.error("发布失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 商铺关闭
+     * @param id  实体ID
+     * @return
+     */
+    @RequestMapping(value="/admin/taShop/{id}/off",method= RequestMethod.PUT)
+    @ApiOperation(value="商铺关闭", notes = "商铺关闭", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean unPublish(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+
+        TaShop taShop = iTaShopService.getById(id);
+        taShop.setStatus(Constants.STATUS_READY);
+
+        if (iTaShopService.updateById(taShop)){
+            TaResource taResource = taResourceService.getByTarget(Constants.TARGET_SHOP, id);
+            taResource.setStatus(taShop.getStatus());
+            taResourceService.updateById(taResource);
+
+            return ResponseBean.success(taShop);
+        }else {
+            return ResponseBean.error("取消发布失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+
+
     /**
      * 根据id查询对象
      * @param id  实体ID

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

@@ -68,14 +68,14 @@ public class TaTouristController extends BaseController {
     public ResponseBean taTouristList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                       @ApiParam("景点名称") @RequestParam(value ="touristName", required = false) String touristName,
-                                      @ApiParam("区位") @RequestParam(value ="cityId", required = false) String cityId) throws Exception{
+                                      @ApiParam("区位") @RequestParam(value ="areaId", required = false) String areaId) throws Exception{
 
         IPage<TaTourist> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaTourist> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderByDesc("weight");
         queryWrapper.orderByDesc("create_date");
 
-        IPage<TaTourist> result = iTaTouristService.getPagedBy(pg, touristName, cityId);
+        IPage<TaTourist> result = iTaTouristService.getPagedBy(pg, touristName, areaId);
         return ResponseBean.success(result);
     }
 

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

@@ -126,7 +126,7 @@ public class TdCityController extends BaseController {
 
         TdCity parent = iTdCityService.getById(tdCity.getAreaPId());
         if (null != parent) {
-            tdCity.setAreaPName(parent.getAreaPName());
+            tdCity.setAreaPName(parent.getAreaName());
         }
 
         return ResponseBean.success(tdCity);

src/main/java/com/yunzhi/shigongli/entity/TaResource.java

@@ -67,4 +67,7 @@ public class TaResource implements Serializable {
 
     @ApiModelProperty(value = "所属区")
     private String cityId;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
 }

src/main/java/com/yunzhi/shigongli/entity/TaRoom.java

@@ -66,5 +66,4 @@ public class TaRoom implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-
 }

src/main/java/com/yunzhi/shigongli/entity/TaRoomOrder.java

@@ -2,6 +2,8 @@ package com.yunzhi.shigongli.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -54,5 +56,7 @@ public class TaRoomOrder implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-
+    @ApiModelProperty(value = "分享图")
+    @TableField(exist = false)
+    private String shareImage;
 }

src/main/java/com/yunzhi/shigongli/entity/TaTourist.java

@@ -89,6 +89,10 @@ public class TaTourist implements Serializable {
     @TableField(exist = false)
     private Integer uvNum;
 
+    @ApiModelProperty(value = "所属区位名称")
+    @TableField(exist = false)
+    private String areaName;
+
     @ApiModelProperty(value = "图片列表")
     @TableField(exist = false)
     private List<TaImage> imageList;

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

@@ -1,5 +1,6 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
@@ -63,7 +64,11 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
     public WxPayMpOrderResult order(TaPerson person, OrderItem[] orderItems) throws Exception {
         LocalDateTime now = LocalDateTime.now();
 
-        // 先生成主订单
+        // 是否首单
+        TaOrder lastOrder = getPersonLastOrder(person.getPersonId());
+        boolean isFirstOrder = null == lastOrder;
+
+                // 先生成主订单
         TaOrder taOrder = new TaOrder();
         taOrder.setOrderId(getOrderNo());
         taOrder.setDescription("套餐");
@@ -73,7 +78,7 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
         taOrder.setCreateDate(now);
 
         // 子订单列表
-        Integer charge = createAndSaveOrderSubList(taOrder, orderItems);
+        Integer charge = createAndSaveOrderSubList(person, taOrder, orderItems, isFirstOrder);
         taOrder.setCharges(charge);
         save(taOrder);
 
@@ -145,7 +150,7 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
      * @return
      * @throws Exception
      */
-    private Integer createAndSaveOrderSubList(TaOrder taOrder, OrderItem[] orderItems) throws Exception {
+    private Integer createAndSaveOrderSubList(TaPerson taPerson, TaOrder taOrder, OrderItem[] orderItems, boolean isFirstOrder) throws Exception {
         LocalDateTime now = LocalDateTime.now();
 
         Integer totalCharge = 0;
@@ -187,6 +192,10 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
                 throw new Exception("订单中存在异常套餐, 请联系管理员");
             }
 
+            // 当前套餐的店铺是否当前下单人的推荐人
+            boolean isRecommend = Constants.RECOMMEND_SHOP.equals(taPerson.getFromType())
+                    && shopPackage.getShopId().equals(taPerson.getRecommender());
+
             orderSub.setPackageId(packageId);
 
             // 价格
@@ -204,9 +213,12 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
             // 返现设置
             orderSub.setCashback(shopPackage.getCashback());
 
+            // 新客户首次推荐店铺下单, 商铺不需要给平台分成
+            boolean needCommission = !isFirstOrder || !isRecommend;
+
             // 套餐分成设置
             TaShopPackageSetting packageSetting = packageSettingMapper.selectById(packageId);
-            if (null != packageSetting) {
+            if (null != packageSetting && needCommission) {
                 // 参与分成金额 = 总金额 - 返现金额
                 Integer charges = orderSub.getCharges() - orderSub.getCashback();
 
@@ -242,6 +254,21 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
         return totalCharge;
     }
 
+    /**
+     * 获取人员最近的一笔订单
+     * @param personId
+     * @return
+     */
+    private TaOrder getPersonLastOrder(String personId) {
+        LambdaQueryWrapper<TaOrder> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaOrder::getPersonId, personId);
+        queryWrapper.gt(TaOrder::getStatus, Constants.STATUS_DELETED);
+        queryWrapper.orderByDesc(TaOrder::getCreateDate);
+        queryWrapper.last("limit 1");
+
+        return getOne(queryWrapper);
+    }
+
     /**
      * 生成并保存抽成表
      * @param orderSub

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

@@ -0,0 +1,64 @@
+package com.yunzhi.shigongli.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * https://lbs.amap.com/api/webservice/guide/api/weatherinfo
+ */
+
+@ApiModel(description = "高德地图天气")
+@Data
+public class AMapWeather {
+
+    @ApiModelProperty("返回状态")
+    private String status;
+
+    @ApiModelProperty("返回结果总数目")
+    private String count;
+
+    @ApiModelProperty("返回的状态信息")
+    private String info;
+
+    @ApiModelProperty("返回状态说明,10000代表正确")
+    private String infocode;
+
+    @ApiModelProperty("实况天气数据信息")
+    private List<Live> lives;
+
+    @ApiModel(description = "实时天气")
+    @Data
+    public static class Live {
+
+        @ApiModelProperty("省份名")
+        private String province;
+
+        @ApiModelProperty("城市名")
+        private String city;
+
+        @ApiModelProperty("区域编码")
+        private String adcode;
+
+        @ApiModelProperty("天气现象（汉字描述）")
+        private String weather;
+
+        @ApiModelProperty("实时气温，单位：摄氏度")
+        private String temperature;
+
+        @ApiModelProperty("风向描述")
+        private String winddirection;
+
+        @ApiModelProperty("风力级别，单位：级")
+        private String windpower;
+
+        @ApiModelProperty("空气湿度")
+        private String humidity;
+
+        @ApiModelProperty("数据发布的时间")
+        private String reporttime;
+    }
+}

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

@@ -40,4 +40,7 @@ public class ResourceFieldVO {
 
     @ApiModelProperty(value = "所属区")
     private String cityId;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
 }

src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
       max-file-size: 10MB
       max-request-size: 50MB
   datasource:
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/shigongli-v2?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/shigongli-v2-test?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: shigongli
     password: shigongli@123
 

src/main/resources/application.yml

@@ -18,6 +18,7 @@ interceptor:
       - /swagger-ui/**
       - /swagger-resources/**
       - /v2/**
+      - /test-weather
 
 ###
 mybatis-plus:
@@ -28,8 +29,8 @@ mybatis-plus:
 
 ###
 aliyun:
-  accessKeyId: LTAIGQtIi28MfXms
-  accessKeySecret: b6maakcdzEywmkhcK15rStx54hOiIA
+  accessKeyId: LTAI5tGjnZY6k799BHxhmqcm
+  accessKeySecret: eU1DmULbgHe2dnIg3P93634PO2vEh5
   oss:
     roleSessionName: shigongli
     accessKeyId: LTAI4G9zCefU1m7sKmmBnzTc
@@ -62,6 +63,12 @@ weixin:
     notifyUrl: https://sgl.njyunzhi.com/api/wxpay/notify/order
     refundNotifyUrl: https://sgl.njyunzhi.com/api/wxpay/notify/refund
 
+## 高德地图
+amap:
+  weather:
+    api: https://restapi.amap.com/v3/weather/weatherInfo?key=3be0a9567a794d2690d378476f057a6f&city=%s&extensions=base&output=JSON
+    backImage: https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/weather/background_%s.png
+
 ###
 spring:
   application:

src/main/resources/mapper/TaTouristMapper.xml

@@ -7,11 +7,13 @@
             t.*,
             s.like_num,
             s.pv_num,
-            s.uv_num
+            s.uv_num,
+            m.area_name
         FROM
             ta_tourist t
-                LEFT JOIN ta_resource s ON s.target_type = 'tourist'
+            LEFT JOIN ta_resource s ON s.target_type = 'tourist'
                 AND s.target_id = t.tourist_id
+            LEFT JOIN td_city m on m.area_id = t.city_id
         WHERE
             t.`status` > - 1
           <if test="touristName != null and touristName != ''">