#feat 订单、商品、用户地址、评价 接口新增

yanghui

2022-11-15 a1a51a92fd386ff07a7f05e40076508430a3c026

#feat 订单、商品、用户地址、评价 接口新增

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java

New file
@@ -0,0 +1,259 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @auther yh
 * @create 2022-11-08 17:25:45
 * @describe 商城模块API
 */
@Slf4j
@RestController
@RequestMapping("/shopFlower/")
@Api(tags = {"商城服务"})
public class ShopFlowerApi extends BaseController {

    @Resource
    private CommunityService communityService;


/*    @ApiOperation(value = "查询店铺详情", response = PageShopStoreVO.class)
    @PostMapping("shopstoredetail")
    public R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO) {
        if (comShopStoreDTO == null || comShopStoreDTO.getStoreId() == null) {
            return R.fail("参数错误");
        }
        return communityService.shopStoreDetail(comShopStoreDTO);
    }*/

    @ApiOperation(value = "分页查询商品列表", response = ComShopFlowerGoodsVO.class)
    @PostMapping("pageShopGoods")
    public R pageShopGoods(@RequestBody ComShopFlowerGoodsDTO comShopGoodsDTO) {
        return communityService.pageShopFlowerGoodsByApp(comShopGoodsDTO);
    }

    @ApiOperation(value = "查询商品详情", response = ComShopFlowerGoodsVO.class)
    @PostMapping("shopGoodsDetail")
    @ApiImplicitParam(name = "goodsId", value = "商品id", required = true)
    public R shopGoodsDetail(@RequestParam("goodsId") Long goodsId) {
        return communityService.shopFlowerGoodsDetail(goodsId);
    }

    @ApiOperation(value = "查询用户收货地址列表", response = ComShopUserAddressVO.class)
    @PostMapping("shopUserAddressList")
    public R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO) {
        Long userId = this.getUserId();
        if (userId == null) {
            return R.fail("请重新登陆");
        }
        comShopAddressDTO.setUserId(userId);
        return communityService.shopFlowerUserAddressList(comShopAddressDTO);
    }

    @ApiOperation(value = "添加用户收货地址列表")
    @PostMapping("shopAddUserAddress")
    public R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
        Long userId = this.getUserId();
        if (userId == null) {
            return R.fail("请重新登陆");
        }
        comShopAddressDTO.setUserId(userId);
        return communityService.shopFlowerAddUserAddress(comShopAddressDTO);
    }

    @ApiOperation(value = "修改用户收货地址列表")
    @PostMapping("shopEditUserAddress")
    public R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
        Long userId = this.getUserId();
        if (userId == null) {
            return R.fail("请重新登陆");
        }
        comShopAddressDTO.setUserId(userId);
        return communityService.shopFlowerEditUserAddress(comShopAddressDTO);
    }

    @ApiOperation(value = "删除用户收货地址列表")
    @PostMapping("shopDelUserAddress")
    @ApiImplicitParam(name = "addressId", value = "收货地址id", required = true)
    public R shopDelUserAddress(@RequestParam("addressId") Long addressId) {
        return communityService.shopFlowerDelUserAddress(addressId);
    }

    @ApiOperation(value = "订单预览", response = ComShopOrderPreviewVO.class)
    @PostMapping("orderPreview")
    public R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
        Long userId = this.getUserId();
        if (userId == null) {
            return R.fail("请重新登陆");
        }
        orderPreviewDTO.setUserId(userId);
        return communityService.orderPreviewFlower(orderPreviewDTO);
    }

    @ApiOperation(value = "创建订单", response = ComShopOrderVO.class)
    @PostMapping("orderCreate")
    public R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (loginUserInfo == null) {
            return R.fail("请重新登陆");
        }
        orderCreateDTO.setUserId(loginUserInfo.getUserId());
        orderCreateDTO.setPhone(loginUserInfo.getPhone());
        orderCreateDTO.setOpenId(loginUserInfo.getOpenid());
        return communityService.orderCreateFlower(orderCreateDTO);
    }

    @ApiOperation(value = "分页查询订单列表", response = ComShopOrderPageVO.class)
    @PostMapping("pageOrderList")
    public R pageOrderList(@RequestBody PageComFlowerOrderListDTO comOrderListDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (loginUserInfo == null) {
            return R.fail("请重新登陆");
        }
        comOrderListDTO.setUserId(loginUserInfo.getUserId());
        return communityService.pageOrderListFlower(comOrderListDTO);
    }

    @ApiOperation(value = "查询订单详情", response = ComShopOrderPageVO.class)
    @PostMapping("orderDetail")
    @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
    public R orderDetail(@RequestParam("orderId") Long orderId) {
        return communityService.orderDetail(orderId);
    }

    @ApiOperation(value = "取消订单")
    @PostMapping("orderCancel")
    public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (loginUserInfo == null) {
            return R.fail("请重新登陆");
        }
        return communityService.orderCancelFlower(comShopOrderQueryDTO);
    }

    @ApiOperation(value = "删除订单")
    @PostMapping("orderDelete")
    @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
    public R orderDelete(@RequestParam("orderId") Long orderId) {
        return communityService.orderDelete(orderId);
    }

    @ApiOperation(value = "订单确认收货")
    @PostMapping("orderConfirm")
    public R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (loginUserInfo == null) {
            return R.fail("请重新登陆");
        }
        return communityService.orderConfirmFlower(comShopOrderQueryDTO);
    }



/*    @ApiOperation(value = "统计当前用户订单", response = OrderStatisticsVO.class)
    @PostMapping("orderStatistics")
    public R orderStatistics() {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (loginUserInfo == null) {
            return R.fail("请重新登陆");
        }
        return communityService.orderStatistics(loginUserInfo.getUserId());
    }*/

    @ApiOperation(value = "小程序微信调起支付")
    @PostMapping("wxpay")
    public R wxPay(@RequestBody OrderPayDTO orderPayDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (loginUserInfo == null) {
            return R.fail("请重新登陆");
        }
        orderPayDTO.setOpenId(loginUserInfo.getOpenid());
        return communityService.wxPay(orderPayDTO);
    }

    /**
     * 获取当前商铺周围的自提点信息以及距离手机距离
     *
     * @param merchantId
     * @return
     */
    @ApiOperation(value = "获取自提点")
    @ApiImplicitParams({@ApiImplicitParam(name = "merchantId", value = "商家Id", required = true),
            @ApiImplicitParam(name = "lat", value = "经度", required = true), @ApiImplicitParam(name = "lng", value = "纬度", required = true)})
    @GetMapping("/point/findPointByMerchantId")
    public R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng) {
        return communityService.findPointByMerchantId(merchantId, lat, lng);
    }

    /**
     * 保存评价
     * @param comShopFlowerEvaluateDTO
     * @return
     */
    @ApiOperation(value = "保存评价")
    @PostMapping("/saveEvaluate")
    public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO){
        return communityService.saveEvaluate(comShopFlowerEvaluateDTO);
    }

    /**
     * 分页查询评价
     * @param pageComShopFlowerEvaluateDTO
     * @return
     */
    @ApiOperation(value = "分页查询评价",response = ComShopFlowerEvaluateVO.class)
    @PostMapping("/pageEvaluate")
    public R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO){
        return communityService.pageEvaluate(pageComShopFlowerEvaluateDTO);
    }

    /**
     * 评价详情
     * @param id
     * @return
     */
    @ApiOperation(value = "评价详情")
    @GetMapping("/detailEvaluate")
    public R detailEvaluate(@RequestParam("id") Long id){
        return communityService.detailEvaluate(id);
    }

    /**
     * 删除评价
     * @param id
     * @return
     */
    @ApiOperation(value = "删除评价")
    @DeleteMapping("deleteEvaluate")
    public R deleteEvaluate(@RequestParam("id") Long id){
        return communityService.deleteEvaluate(id);
    }

    /**
     * 取货码
     * @param orderId
     * @return
     */
    @ApiOperation(value = "取货码")
    @GetMapping("getQRCode")
    @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
    public R getQRCode(@RequestParam("orderId") Long orderId){
        return communityService.getQRCode(orderId);
    }



}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerEvaluateDTO.java

New file
@@ -0,0 +1,65 @@
package com.panzhihua.common.model.dtos.shop;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * @ClassName:  ComShopFlowerEvaluate
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: 评价表
 */

@Data
@ApiModel("评价信息")
public class ComShopFlowerEvaluateDTO{


    /**
     * 订单号
     */
    @ApiModelProperty(value = "订单号")
    private String orderNo;

    /**
     * 商品id
     */
    @ApiModelProperty(value = "商品id")
    private String goodsId;

    /**
     * 评价人id
     */
    @ApiModelProperty(value = "评价人id")
    private Long userId;

    /**
     * 评价时间
     */
    @ApiModelProperty(value = "评价时间")
    private Date evaluateTime;

    /**
     * 评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)
     */
    @ApiModelProperty(value = "评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)")
    private Integer evaluateType;

    /**
     * 评价内容
     */
    @ApiModelProperty(value = "评价内容")
    private String evaluateContent;

    /**
     * 评价图片
     */
    @ApiModelProperty(value = "评价图片")
    private String evaluatePic;


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerGoodsDTO.java

@@ -33,4 +33,7 @@

    @ApiModelProperty(hidden = true)
    private Long userId;

    @ApiModelProperty("商品分类id")
    private Long categoriesId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateDTO.java

@@ -27,6 +27,9 @@
    @ApiModelProperty(value = "用户收货地址id", required = true)
    private Long receiverId;

    @ApiModelProperty(value = "自提点地址id")
    private Long pointId;

    @ApiModelProperty(value = "订单备注")
    private String remark;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerEvaluateDTO.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.common.model.dtos.shop;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @auther lyq
 * @create 2021-04-14 15:02:14
 * @describe 分页查询订单列表
 */
@Data
@ApiModel("评价查询")
public class PageComShopFlowerEvaluateDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "商品id")
    private Long goodsId;

    @ApiModelProperty(value = "用户id")
    private Long userId;

    @ApiModelProperty(value = "订单id")
    private Long orderId;

    @ApiModelProperty(value = "评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)")
    private Integer evaluateType;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -244,6 +244,7 @@

    private Long bindingCheckUnitId;

    @ApiModelProperty("后台账号类型")
    private Integer backstageType;


@@ -256,4 +257,7 @@

    @ApiModelProperty("物业公司id")
    private Long propertyId;

    @ApiModelProperty("商家后台账号id")
    private Long backstageUserId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java

@@ -86,4 +86,10 @@
     */
    @ApiModelProperty("已提货数量")
    private Long alreadyGoodsNum;

    /**
     * 距离手机定位距离
     */
    @ApiModelProperty("距离手机定位距离")
    private Double distance;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community.convenient;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@@ -112,6 +113,12 @@
    @ApiModelProperty("手机号")
    private String mobilePhone;

    @ApiModelProperty("店铺销量")
    private Integer sale;

    @ApiModelProperty("店铺销售额")
    private BigDecimal saleVolume;

    public void setPeriod(String period) {
        this.period = MerchantBusinessPeriod.valueOf(period);
    }

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerEvaluateVO.java

New file
@@ -0,0 +1,68 @@
package com.panzhihua.common.model.vos.shop;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * @ClassName:  ComShopFlowerEvaluate
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: 评价表
 */

@Data
@ApiModel("评价信息")
public class ComShopFlowerEvaluateVO{
    private static final long serialVersionUID = 1L;
    /**
     * ,主键
     */
    @ApiModelProperty("评价id")
    private Long id;

    /**
     * 订单号
     */
    @ApiModelProperty("订单号")
    private String orderNo;

    /**
     * 商品id
     */
    @ApiModelProperty("商品id")
    private String goodsId;

    /**
     * 评价人id
     */
    @ApiModelProperty("评价人id")
    private Long userId;

    /**
     * 评价时间
     */
    @ApiModelProperty("评价时间")
    private Date evaluateTime;

    /**
     * 评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)
     */
    @ApiModelProperty("评价类型(1.非常满意 2.满意 3.一般 4.不满意 5.糟糕透了)")
    private Integer evaluateType;

    /**
     * 评价内容
     */
    @ApiModelProperty("评价内容")
    private String evaluateContent;

    /**
     * 评价图片
     */
    @ApiModelProperty("评价图片")
    private String evaluatePic;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java

@@ -118,4 +118,16 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("创建时间")
    private Date createAt;

    /**
     * 配送方式（1.商家配送 2.快递物流）
     */
    @ApiModelProperty("订单数量（拼单数量、买过数量）")
    private Integer orderNum;

    /**
     * 商品规格列表
     */
    @ApiModelProperty("评价列表，最新三条")
    private List<ComShopFlowerEvaluateVO> shopFlowerEvaluateVOList;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java

@@ -1,6 +1,7 @@
package com.panzhihua.common.model.vos.shop;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -90,4 +91,10 @@
    @ApiModelProperty(value = "订单日志")
    private List<ComShopFlowerOrderOperateVO> logs;

    @ApiModelProperty(value = "自提点信息")
    private ConvenientElevatingPointVO convenientElevatingPointVO;

    @ApiModelProperty(value = "评价")
    private ComShopFlowerEvaluateVO comShopFlowerEvaluateVO;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -35,6 +35,7 @@
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
@@ -2987,6 +2988,16 @@
     */
    @GetMapping("/shopFlower/changeShopGoodsStatus")
    R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);

    /**
     * 修改商品状态
     *
     * @param goodsId
     * @return
     */
    @PostMapping("/shopFlower/shopGoodsDetail")
    R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId);



    /**
@@ -10694,4 +10705,199 @@
     * */
    @GetMapping("comProperty/noticeList")
    R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId);

    /**
     * 获取所有商品分类
     * @return
     */
    @GetMapping("/goodsCategory/getAllGoodsCategories")
    R getAllGoodsCategories();

    /**
     * 分页查询用户收货地址列表
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 用户收货地址列表
     */
    @PostMapping("/shopFlower/shopUserAddressList")
    R shopFlowerUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO);

    /**
     * 用户添加收货地址
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 添加结果
     */
    @PostMapping("/shopFlower/shopAddUserAddress")
    R shopFlowerAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

    /**
     * 用户修改收货地址
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 修改结果
     */
    @PostMapping("/shopFlower/shopEditUserAddress")
    R shopFlowerEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

    /**
     * 用户删除收货地址
     *
     * @param addressId
     *            收货地址id
     * @return 删除结果
     */
    @PostMapping("/shopFlower/shopDelUserAddress")
    R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId);

    /**
     * 订单预览
     *
     * @param orderPreviewDTO 请求参数
     * @return 订单预览数据
     */
    @PostMapping("/shopFlower/orderPreview")
    R orderPreviewFlower(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO);

    /**
     * 创建订单
     *
     * @param orderCreateDTO 创建订单请求参数
     * @return 创建结果
     */
    @PostMapping("/shopFlower/orderCreate")
    R orderCreateFlower(@RequestBody ComShopOrderCreateDTO orderCreateDTO);

    /**
     * 分页查询用户订单列表
     *
     * @param comOrderListDTO 请求参数
     * @return 查询结果
     */
    @PostMapping("/shopFlower/pageOrderList")
    R pageOrderListFlower(@RequestBody PageComFlowerOrderListDTO comOrderListDTO);

    /**
     * 根据订单id查询订单详情
     *
     * @param orderId 订单id
     * @return 订单详情
     */
    @PostMapping("/shopFlower/orderDetail")
    R orderDetailFlower(@RequestParam("orderId") Long orderId);

    /**
     * 根据订单id取消订单
     *
     * @param comShopOrderQueryDTO 请求参数
     * @return 取消结果
     */
    @PostMapping("/shopFlower/orderCancel")
    R orderCancelFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

    /**
     * 根据订单id删除订单
     *
     * @param orderId 订单id
     * @return 删除结果
     */
    @PostMapping("/shopFlower/orderDelete")
    R orderDeleteFlower(@RequestParam("orderId") Long orderId);

    /**
     * 根据订单id确认收货
     *
     * @param comShopOrderQueryDTO 请求参数
     * @return 确认结果
     */
    @PostMapping("/shopFlower/orderConfirm")
    R orderConfirmFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

    /**
     * 分页查询 商家订单
     *
     * @param pageComShopOrderSearchDTO 分页数据
     * @return 分页订单
     */
    @PostMapping("/shopFlower/order/page")
    R pageShopOrderFlower(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
    /**
     * 订单发货
     *
     * @param orderShipDTO 发货信息
     * @return 发货结果
     */
    @PostMapping("/shopFlower/shipOrder")
    R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO);

    /**
     * 订单配送
     *
     * @param deliverDTO 订单ID
     * @return 配送结果
     */
    @PostMapping("/shopFlower/deliverOrder")
    R deliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);

    /**
     * 订单配送
     *
     * @param deliverDTO 订单ID
     * @return 配送完成
     */
    @PostMapping("/shopFlower/finishDeliverOrder")
    R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);

    /**
     * 获取当前商铺周围的自提点信息以及距离手机距离
     *
     * @param merchantId
     * @return
     */
    @GetMapping("/convenient/point/findPointByMerchantId")
    R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng);

    /**
     * 保存评价
     * @param comShopFlowerEvaluateDTO
     * @return
     */
    @PostMapping("/shopFlower/saveEvaluate")
    R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO);

    /**
     * 分页查询评价
     * @param pageComShopFlowerEvaluateDTO
     * @return
     */
    @PostMapping("/pageEvaluate")
    R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO);

    /**
     * 评价详情
     * @param id
     * @return
     */
    @GetMapping("/shopFlower/detailEvaluate")
    R detailEvaluate(@RequestParam("id") Long id);

    /**
     * 删除评价
     * @param id
     * @return
     */
    @DeleteMapping("/shopFlower/deleteEvaluate")
    R deleteEvaluate(@RequestParam("id") Long id);

    /**
     * 取货码
     * @param id
     * @return
     */
    @ApiOperation(value = "取货码")
    @GetMapping("/shopFlower/getQRCode")
    R getQRCode(@RequestParam("id") Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ShopFlowerApi.java

@@ -91,6 +91,12 @@
        return communityService.changeFlowerStatus(id, status);
    }

    @ApiOperation(value = "商品分类")
    @GetMapping("/goodsCategory/getAllGoodsCategories")
    public R getAllGoodsCategories() {
        return communityService.getAllGoodsCategories();
    }

    /*@ApiOperation(value = "订单_分页列表", response = ComShopOrderSearchVO.class)
    @PostMapping("/order/page")
    public R page(@RequestBody @Validated PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java

@@ -1,34 +1,17 @@
package com.panzhihua.service_community.api;

import java.time.Instant;
import java.util.List;

import javax.annotation.Resource;
import javax.validation.Valid;

import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.convenient.*;
import com.panzhihua.service_community.service.*;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;

import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;

/**
 * @description: 便民服务接口
@@ -70,8 +53,7 @@
    /**
     * 社区后台分页查询便民服务商家
     *
     * @param pageComCvtBusinessDTO
     *            查询参数
     * @param pageComCvtBusinessDTO 查询参数
     * @return 返回结果
     */
    @PostMapping("/business/page")
@@ -82,8 +64,7 @@
    /**
     * 小程序通过便民服务区域分页查询便民服务商家
     *
     * @param comCvtBusinessAppletsDTO
     *            查询参数
     * @param comCvtBusinessAppletsDTO 查询参数
     * @return 返回结果
     */
    @PostMapping("/business/area/page")
@@ -94,8 +75,7 @@
    /**
     * 新增便民服务商家
     *
     * @param comCvtBusinessDTO
     *            商家参数
     * @param comCvtBusinessDTO 商家参数
     * @return 返回结果
     */
    @PostMapping("/business/add")
@@ -106,8 +86,7 @@
    /**
     * 编辑便民服务商家
     *
     * @param comCvtBusinessDTO
     *            商家参数
     * @param comCvtBusinessDTO 商家参数
     * @return 返回结果
     */
    @PutMapping("/business/put")
@@ -118,8 +97,7 @@
    /**
     * 查询便民服务商家详情
     *
     * @param id
     *            商家主键
     * @param id 商家主键
     * @return 返回结果
     */
    @GetMapping("/business/get")
@@ -130,8 +108,7 @@
    /**
     * 删除便民服务商家信息
     *
     * @param id
     *            商家主键
     * @param id 商家主键
     * @return 返回结果
     */
    @DeleteMapping("/business/delete")
@@ -142,8 +119,7 @@
    /**
     * 社区后台分页查询便民服务分类
     *
     * @param pageComCvtCategoryDTO
     *            查询参数
     * @param pageComCvtCategoryDTO 查询参数
     * @return 返回结果
     */
    @PostMapping("/category/page")
@@ -153,7 +129,7 @@

    /**
     * 便民服务分类下拉,所有分类
     * 
     *
     * @return 返回结果
     */
    @PostMapping("/category/all")
@@ -164,8 +140,7 @@
    /**
     * 新增便民服务分类
     *
     * @param comCvtCategoryDTO
     *            分类参数
     * @param comCvtCategoryDTO 分类参数
     * @return 返回结果
     */
    @PostMapping("/category/add")
@@ -176,8 +151,7 @@
    /**
     * 编辑便民服务分类
     *
     * @param comCvtCategoryDTO
     *            分类参数
     * @param comCvtCategoryDTO 分类参数
     * @return 返回结果
     */
    @PutMapping("/category/put")
@@ -188,8 +162,7 @@
    /**
     * 查询便民服务分类详情
     *
     * @param id
     *            分类主键
     * @param id 分类主键
     * @return 返回结果
     */
    @GetMapping("/category/get")
@@ -200,8 +173,7 @@
    /**
     * 删除便民服务分类信息
     *
     * @param id
     *            分类主键
     * @param id 分类主键
     * @return 返回结果
     */
    @DeleteMapping("/category/delete")
@@ -212,8 +184,7 @@
    /**
     * 社区后台分页查询便民服务
     *
     * @param pageComCvtServeDTO
     *            查询参数
     * @param pageComCvtServeDTO 查询参数
     * @return 返回结果
     */
    @PostMapping("/serve/page")
@@ -224,8 +195,7 @@
    /**
     * 新增便民服务
     *
     * @param comCvtServeDTO
     *            参数
     * @param comCvtServeDTO 参数
     * @return 返回结果
     */
    @PostMapping("/serve/add")
@@ -236,8 +206,7 @@
    /**
     * 编辑便民服务
     *
     * @param comCvtServeDTO
     *            分类参数
     * @param comCvtServeDTO 分类参数
     * @return 返回结果
     */
    @PutMapping("/serve/put")
@@ -248,8 +217,7 @@
    /**
     * 查询便民服务详情
     *
     * @param id
     *            服务主键
     * @param id 服务主键
     * @return 返回结果
     */
    @GetMapping("/serve/get")
@@ -260,8 +228,7 @@
    /**
     * 删除便民服务信息
     *
     * @param id
     *            服务主键
     * @param id 服务主键
     * @return 返回结果
     */
    @DeleteMapping("/serve/delete")
@@ -271,9 +238,8 @@

    /**
     * 小程序便民服务商家详情
     * 
     * @param id
     *            商家ID
     *
     * @param id 商家ID
     * @return
     */
    @GetMapping("/business/serve/get")
@@ -283,18 +249,18 @@

    /**
     * 批量新增商家服务
     * 
     * @param list
     *            服务集合
     *
     * @param list 服务集合
     */
    @PostMapping("/serve/import")
    public R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,
        @RequestParam(value = "communityId", required = false) Long communityId) {
                                            @RequestParam(value = "communityId", required = false) Long communityId) {
        return comCvtServeService.listSaveConvenientServeExcelVO(list, communityId);
    }

    /**
     * 便民服务新增分类
     *
     * @param convenientServiceCategoryDTO
     * @return
     */
@@ -305,6 +271,7 @@

    /**
     * 便民服务分类编辑
     *
     * @param convenientServiceCategoryDTO
     * @return
     */
@@ -315,6 +282,7 @@

    /**
     * 便民服务分类删除
     *
     * @param categoryId
     * @return
     */
@@ -325,6 +293,7 @@

    /**
     * 获取便民服务分类详情
     *
     * @param categoryId
     * @return
     */
@@ -335,6 +304,7 @@

    /**
     * 分页查询便民服务分类
     *
     * @param pageConvenientServiceCategoryDTO
     * @return
     */
@@ -345,6 +315,7 @@

    /**
     * 便民服务新增商家
     *
     * @param convenientMerchantDTO
     * @return
     */
@@ -355,6 +326,7 @@

    /**
     * 编辑便民服务商家
     *
     * @param convenientMerchantDTO
     * @return
     */
@@ -365,6 +337,7 @@

    /**
     * 删除便民服务商家
     *
     * @param merchantId
     * @return
     */
@@ -375,6 +348,7 @@

    /**
     * 分页查询便民服务商家 运营后台
     *
     * @param pageConvenientMerchantDTO
     * @return
     */
@@ -385,6 +359,7 @@

    /**
     * 获取便民服务商家详情
     *
     * @param merchantId
     * @return
     */
@@ -395,6 +370,7 @@

    /**
     * 禁用/启用便民服务商家
     *
     * @param disableOrEnableConvenientMerchantDTO
     * @return
     */
@@ -405,6 +381,7 @@

    /**
     * 重置便民服务商家账号密码
     *
     * @param resetPasswordConvenientMerchantDTO
     * @return
     */
@@ -415,6 +392,7 @@

    /**
     * 获取所有便民服务分类
     *
     * @return
     */
    @GetMapping("/service-category/all")
@@ -424,6 +402,7 @@

    /**
     * 获取用户便民服务商家详情
     *
     * @param account 商家绑定账号
     * @return
     */
@@ -434,6 +413,7 @@

    /**
     * 获取商便民服务商家信息
     *
     * @param userId
     * @return
     */
@@ -444,6 +424,7 @@

    /**
     * 新增便民服务产品分类信息
     *
     * @param convenientProductCategoryDTO
     * @return
     */
@@ -454,6 +435,7 @@

    /**
     * 编辑便民服务产品分类信息
     *
     * @param convenientProductCategoryDTO
     * @return
     */
@@ -464,6 +446,7 @@

    /**
     * 删除便民服务产品分类信息
     *
     * @param categoryId
     * @param operator
     * @return
@@ -475,6 +458,7 @@

    /**
     * 获取便民服务产品分类详情
     *
     * @param categoryId
     * @return
     */
@@ -485,6 +469,7 @@

    /**
     * 分页查询便民服务产品分类信息
     *
     * @param pageConvenientProductCategoryDTO
     * @return
     */
@@ -495,6 +480,7 @@

    /**
     * 便民服务商家后台新增产品
     *
     * @param convenientProductDTO
     * @return
     */
@@ -505,6 +491,7 @@

    /**
     * 便民服务商家后台编辑产品
     *
     * @param convenientProductDTO
     * @return
     */
@@ -515,6 +502,7 @@

    /**
     * 便民服务商家后台获取产品详情
     *
     * @param productId
     * @return
     */
@@ -525,6 +513,7 @@

    /**
     * 便民服务商家后台分页获取产品信息
     *
     * @param pageConvenientProductDTO
     * @return
     */
@@ -535,6 +524,7 @@

    /**
     * 便民服务商家后台删除产品信息
     *
     * @param deleteConvenientProductDTO
     * @return
     */
@@ -545,6 +535,7 @@

    /**
     * 便民服务商家后台上架/下架产品
     *
     * @param onShelfOrOffShelfProductDTO
     * @return
     */
@@ -555,8 +546,9 @@

    /**
     * 获取所有产品分类
     * @return
     *
     * @param merchantId
     * @return
     */
    @GetMapping("/product-category/all")
    public R getAllProductCategory(@RequestParam("merchantId") Long merchantId) {
@@ -565,16 +557,18 @@

    /**
     * 获取该社区商家数量大于0的分类
     *
     * @param communityId
     * @return
     */
    @GetMapping("/service-category/suitable")
    public R getSuitableServiceCategories(@RequestParam("communityId") Long communityId,@RequestParam("areaCode")String areaCode) {
        return convenientServiceCategoryService.getSuitableServiceCategories(communityId,areaCode);
    public R getSuitableServiceCategories(@RequestParam("communityId") Long communityId, @RequestParam("areaCode") String areaCode) {
        return convenientServiceCategoryService.getSuitableServiceCategories(communityId, areaCode);
    }

    /**
     * 获取该社区下的热门商家
     *
     * @param pagePopularMerchantDTO
     * @return
     */
@@ -585,6 +579,7 @@

    /**
     * 分页获取服务类型下商家信息
     *
     * @param pageClassifyMerchantDTO
     * @return
     */
@@ -595,6 +590,7 @@

    /**
     * 小程序获取商家详情
     *
     * @param merchantId
     * @return
     */
@@ -605,6 +601,7 @@

    /**
     * 小程序获取商家产品
     *
     * @param merchantId
     * @return
     */
@@ -615,6 +612,7 @@

    /**
     * 获取产品详情
     *
     * @param productId
     * @return
     */
@@ -625,6 +623,7 @@

    /**
     * 搜索商家信息
     *
     * @param pageSearchDTO
     * @return
     */
@@ -635,6 +634,7 @@

    /**
     * 搜索商品信息
     *
     * @param pageSearchDTO
     * @return
     */
@@ -645,6 +645,7 @@

    /**
     * 增加商家店铺咨询量
     *
     * @param merchantId
     * @return
     */
@@ -655,6 +656,7 @@

    /**
     * 增加商家店铺浏览量
     *
     * @param merchantId
     * @return
     */
@@ -665,6 +667,7 @@

    /**
     * 增加产品浏览量
     *
     * @param productId
     * @return
     */
@@ -675,6 +678,7 @@

    /**
     * 获取商家导出数据
     *
     * @param exportMerchantDTO
     * @return
     */
@@ -685,6 +689,7 @@

    /**
     * 定时任务每隔半小时将商家浏览量和咨询量总值计入指定商家数据中
     *
     * @return
     */
    @PostMapping("/timedTaskWriteDataToMerchantJobHandler")
@@ -694,6 +699,7 @@

    /**
     * 获取商家上下架产品数量
     *
     * @param merchantId
     * @return
     */
@@ -705,6 +711,7 @@

    /**
     * 分页查询自提点 运营后台
     *
     * @param pageConvenientElevatingPointDTO
     * @return
     */
@@ -715,6 +722,7 @@

    /**
     * 便民服务新增 自提点
     *
     * @param convenientElevatingPointDTO
     * @return
     */
@@ -725,6 +733,7 @@

    /**
     * 编辑便民服务 自提点
     *
     * @param convenientElevatingPointDTO
     * @return
     */
@@ -735,17 +744,19 @@

    /**
     * 删除便民服务 自提点
     *
     * @param pointId
     * @param operator
     * @return
     */
    @DeleteMapping("/point/delete")
    public R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator) {
        return convenientElevatingPointService.deletePoint(pointId,operator);
        return convenientElevatingPointService.deletePoint(pointId, operator);
    }

    /**
     * 便民服务详情 自提点
     *
     * @param pointId
     * @return
     */
@@ -756,6 +767,7 @@

    /**
     * 新增商品分类
     *
     * @param convenientGoodsCategoryDTO
     * @return
     */
@@ -766,6 +778,7 @@

    /**
     * 编辑
     *
     * @param convenientGoodsCategoryDTO
     * @return
     */
@@ -776,6 +789,7 @@

    /**
     * 删除商品分类
     *
     * @param categoryId
     * @return
     */
@@ -786,6 +800,7 @@

    /**
     * 获取商品分类详情
     *
     * @param categoryId
     * @return
     */
@@ -796,6 +811,7 @@

    /**
     * 分页查询商品分类
     *
     * @param pageConvenientGoodsCategoryDTO
     * @return
     */
@@ -806,10 +822,22 @@

    /**
     * 获取所有商品分类
     *
     * @return
     */
    @GetMapping("/goodsCategory/getAllGoodsCategories")
    public R getAllGoodsCategories(){
    public R getAllGoodsCategories() {
        return convenientGoodsCategoryService.getAllGoodsCategories();
    }

    /**
     * 获取当前商铺周围的自提点信息以及距离手机距离
     *
     * @param merchantId
     * @return
     */
    @GetMapping("/point/findPointByMerchantId")
    public R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng) {
        return convenientElevatingPointService.findPointByMerchantId(merchantId, lat, lng);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java

@@ -1,13 +1,13 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.shop.ComShopFlowerGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerGoodsDTO;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.service.ComShopFlowerGoodsService;
import com.panzhihua.service_community.service.ConvenientGoodsCategoryService;
import com.panzhihua.service_community.service.ConvenientMerchantService;
import com.panzhihua.service_community.service.*;
import com.panzhihua.service_community.util.QRCodeUtil;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -21,19 +21,19 @@

    @Resource
    private ComShopFlowerGoodsService comShopFlowerGoodsService;
//    @Resource
    //    @Resource
//    private ComShopOperLogService comShopOperLogService;
//    @Resource
//    private ComShopOrderService comShopOrderService;
//    @Resource
    @Resource
    private ComShopFlowerOrderService comShopOrderService;
    //    @Resource
//    private ComShopCartService comShopCartService;
//    @Resource
//    private ComShopUserAddressService comShopUserAddressService;
    @Resource
    private ComShopFlowerUserAddressService comShopUserAddressService;

    @Resource
    private ConvenientMerchantService convenientMerchantService;
    @Resource
    private UserService userService;
    private ComShopFlowerEvaluateService comShopFlowerEvaluateService;


    /**
@@ -100,7 +100,7 @@
     * @return 商品信息
     */
    @PostMapping("shopGoodsDetail")
    public R shopGoodsDetail(@RequestParam("goodsId") Long goodsId) {
    public R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId) {
        return comShopFlowerGoodsService.shopFlowerGoodsDetail(goodsId);
    }

@@ -115,20 +115,240 @@
        return comShopFlowerGoodsService.changeStatus(id, status);
    }

    /*
     *//**
    /**
     * 查询用户收货地址列表
     *
     * @param comShopAddressDTO 请求参数
     * @return 用户收获地址列表
     */
    @PostMapping("shopUserAddressList")
    public R shopFlowerUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO) {
        return comShopUserAddressService.shopUserAddressList(comShopAddressDTO);
    }

    /**
     * 用户添加书货地址
     *
     * @param comShopAddressDTO 请求参数
     * @return 添加结果
     */
    @PostMapping("shopAddUserAddress")
    public R shopFlowerAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
        return comShopUserAddressService.shopAddUserAddress(comShopAddressDTO);
    }

    /**
     * 用户修改收货地址
     *
     * @param comShopAddressDTO 请求参数
     * @return 修改结果
     */
    @PostMapping("shopEditUserAddress")
    public R shopFlowerEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
        return comShopUserAddressService.shopEditUserAddress(comShopAddressDTO);
    }

    /**
     * 用户删除收货地址
     *
     * @param addressId 收货地址id
     * @return 删除结果
     */
    @PostMapping("shopDelUserAddress")
    public R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId) {
        return comShopUserAddressService.shopDelUserAddress(addressId);
    }

    /**
     * 订单预览
     *
     * @param orderPreviewDTO 请求参数
     * @return 订单预览数据
     */
    @PostMapping("orderPreview")
    public R orderPreviewFlower(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
        return comShopOrderService.orderPreview(orderPreviewDTO);
    }

    /**
     * 创建订单
     *
     * @param orderCreateDTO 创建订单请求参数
     * @return 创建结果
     */
    @PostMapping("orderCreate")
    public R orderCreateFlower(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
        return comShopOrderService.orderCreate(orderCreateDTO);
    }

    /**
     * 分页查询用户订单列表
     *
     * @param comOrderListDTO 请求参数
     * @return 查询结果
     */
    @PostMapping("pageOrderList")
    public R pageOrderListFlower(@RequestBody PageComFlowerOrderListDTO comOrderListDTO) {
        return comShopOrderService.pageOrderList(comOrderListDTO);
    }

    /**
     * 根据订单id查询订单详情
     *
     * @param orderId 订单id
     * @return 订单详情
     */
    @PostMapping("orderDetail")
    public R orderDetailFlower(@RequestParam("orderId") Long orderId) {
        return comShopOrderService.orderDetail(orderId);
    }

    /**
     * 根据订单id取消订单
     *
     * @param comShopOrderQueryDTO 请求参数
     * @return 取消结果
     */
    @PostMapping("orderCancel")
    public R orderCancelFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
        return comShopOrderService.orderCancel(comShopOrderQueryDTO);
    }

    /**
     * 根据订单id删除订单
     *
     * @param orderId 订单id
     * @return 删除结果
     */
    @PostMapping("orderDelete")
    public R orderDeleteFlower(@RequestParam("orderId") Long orderId) {
        return comShopOrderService.orderDelete(orderId);
    }

    /**
     * 根据订单id确认收货
     *
     * @param comShopOrderQueryDTO 请求参数
     * @return 确认结果
     */
    @PostMapping("orderConfirm")
    public R orderConfirmFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
        return comShopOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
    }

    /**
     * 分页查询 商家订单
     *
     * @param pageComShopOrderSearchDTO
     *            分页数据
     * @param pageComShopOrderSearchDTO 分页数据
     * @return 分页订单
     *//*
     */
    @PostMapping("/order/page")
    public R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
    public R pageShopOrderFlower(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
        return comShopOrderService.pageShopOrder(pageComShopOrderSearchDTO);
    }

    *//**
    /**
     * 订单发货
     *
     * @param orderShipDTO 发货信息
     * @return 发货结果
     */
    @PostMapping("/shipOrder")
    public R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO) {
        return comShopOrderService.shipOrder(orderShipDTO);
    }

    /**
     * 订单配送
     *
     * @param deliverDTO 订单ID
     * @return 配送结果
     */
    @PostMapping("/deliverOrder")
    public R deliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
        return comShopOrderService.deliverOrder(deliverDTO);
    }

    /**
     * 订单配送
     *
     * @param deliverDTO 订单ID
     * @return 配送完成
     */
    @PostMapping("/finishDeliverOrder")
    public  R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
        return comShopOrderService.finishDeliverOrder(deliverDTO);
    }


    /**
     * 保存评价
     * @param comShopFlowerEvaluateDTO
     * @return
     */
    @PostMapping("/saveEvaluate")
    public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO){
        return comShopFlowerEvaluateService.saveEvaluate(comShopFlowerEvaluateDTO);
    }

    /**
     * 分页查询评价
     * @param pageComShopFlowerEvaluateDTO
     * @return
     */
    @PostMapping("/pageEvaluate")
    public R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO){
        return comShopFlowerEvaluateService.pageEvaluate(pageComShopFlowerEvaluateDTO);
    }

    /**
     * 评价详情
     * @param id
     * @return
     */
    @GetMapping("/detailEvaluate")
    public R detailEvaluate(@RequestParam("id") Long id){
        return comShopFlowerEvaluateService.detailEvaluate(id);
    }

    /**
     * 删除评价
     * @param id
     * @return
     */
    @DeleteMapping("deleteEvaluate")
    public R deleteEvaluate(@RequestParam("id") Long id){
        return comShopFlowerEvaluateService.deleteEvaluate(id);
    }

    /**
     * 取货码
     * @param id
     * @return
     */
    @ApiOperation(value = "取货码")
    @GetMapping("getQRCode")
    public R getQRCode(@RequestParam("id") Long id){
        return R.ok(QRCodeUtil.getBase64QRCode(id.toString()));
    }

    /**
     * 统计用户订单数量
     *
     * @param userId
     *            用户id
     * @return 统计结果
     */
/*    @PostMapping("orderStatistics")
    public R orderStatistics(@RequestParam("userId") Long userId) {
        return comShopOrderService.orderStatistics(userId);
    }*/


    /*


     *//**
     * 根据店铺id查询店铺详情
     *
     * @param comShopStoreDTO
@@ -140,175 +360,7 @@
        return comShopStoreService.shopStoreDetail(comShopStoreDTO);
    }

    *//**
     * 分页查询商品列表
     *
     * @param comShopGoodsDTO
     *            请求参数
     * @return 商品列表
     *//*
    @PostMapping("/pageShopGoods")
    public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {

        return comShopFlowerGoodsService.pageShopGoods(comShopGoodsDTO);
    }


    *//**
     * 根据用户id查询购物车列表
     *
     * @param userId
     *            用户id
     * @return 购物车列表信息
     *//*
    @PostMapping("shopCartList")
    public R shopCartList(@RequestParam("userId") Long userId) {
        return comShopCartService.shopCartList(userId);
    }

    *//**
     * 查询用户收货地址列表
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 用户收获地址列表
     *//*
    @PostMapping("shopUserAddressList")
    public R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO) {
        return comShopUserAddressService.shopUserAddressList(comShopAddressDTO);
    }

    *//**
     * 用户添加书货地址
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 添加结果
     *//*
    @PostMapping("shopAddUserAddress")
    public R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
        return comShopUserAddressService.shopAddUserAddress(comShopAddressDTO);
    }

    *//**
     * 用户修改收货地址
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 修改结果
     *//*
    @PostMapping("shopEditUserAddress")
    public R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
        return comShopUserAddressService.shopEditUserAddress(comShopAddressDTO);
    }

    *//**
     * 用户删除收货地址
     *
     * @param addressId
     *            收货地址id
     * @return 删除结果
     *//*
    @PostMapping("shopDelUserAddress")
    public R shopDelUserAddress(@RequestParam("addressId") Long addressId) {
        return comShopUserAddressService.shopDelUserAddress(addressId);
    }

    *//**
     * 订单预览
     *
     * @param orderPreviewDTO
     *            请求参数
     * @return 订单预览数据
     *//*
    @PostMapping("orderPreview")
    public R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
        return comShopOrderService.orderPreview(orderPreviewDTO);
    }

    *//**
     * 创建订单
     *
     * @param orderCreateDTO
     *            创建订单请求参数
     * @return 创建结果
     *//*
    @PostMapping("orderCreate")
    public R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
        return comShopOrderService.orderCreate(orderCreateDTO);
    }

    *//**
     * 分页查询用户订单列表
     *
     * @param comOrderListDTO
     *            请求参数
     * @return 查询结果
     *//*
    @PostMapping("pageOrderList")
    public R pageOrderList(@RequestBody PageComOrderListDTO comOrderListDTO) {
        return comShopOrderService.pageOrderList(comOrderListDTO);
    }

    *//**
     * 根据订单id查询订单详情
     *
     * @param orderId
     *            订单id
     * @return 订单详情
     *//*
    @PostMapping("orderDetail")
    public R orderDetail(@RequestParam("orderId") Long orderId) {
        return comShopOrderService.orderDetail(orderId);
    }

    *//**
     * 根据订单id取消订单
     *
     * @param comShopOrderQueryDTO
     *            请求参数
     * @return 取消结果
     *//*
    @PostMapping("orderCancel")
    public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
        return comShopOrderService.orderCancel(comShopOrderQueryDTO);
    }

    *//**
     * 根据订单id删除订单
     *
     * @param orderId
     *            订单id
     * @return 删除结果
     *//*
    @PostMapping("orderDelete")
    public R orderDelete(@RequestParam("orderId") Long orderId) {
        return comShopOrderService.orderDelete(orderId);
    }

    *//**
     * 根据订单id确认收货
     *
     * @param comShopOrderQueryDTO
     *            请求参数
     * @return 确认结果
     *//*
    @PostMapping("orderConfirm")
    public R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
        return comShopOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
    }

    *//**
     * 统计用户订单数量
     *
     * @param userId
     *            用户id
     * @return 统计结果
     *//*
    @PostMapping("orderStatistics")
    public R orderStatistics(@RequestParam("userId") Long userId) {
        return comShopOrderService.orderStatistics(userId);
    }



@@ -323,41 +375,7 @@
        return comShopOrderService.capitalDetailByStore(id);
    }

    *//**
     * 订单发货
     *
     * @param orderShipDTO
     *            发货信息
     * @return 发货结果
     *//*
    @PostMapping("/shipOrder")
    R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO) {
        return comShopOrderService.shipOrder(orderShipDTO);
    }

    *//**
     * 订单配送
     *
     * @param deliverDTO
     *            订单ID
     * @return 配送结果
     *//*
    @PostMapping("/deliverOrder")
    R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
        return comShopOrderService.deliverOrder(deliverDTO);
    }

    *//**
     * 订单配送
     *
     * @param deliverDTO
     *            订单ID
     * @return 配送完成
     *//*
    @PostMapping("/finishDeliverOrder")
    R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
        return comShopOrderService.finishDeliverOrder(deliverDTO);
    }

    *//**
     * 订单导出信息
@@ -490,4 +508,13 @@
        Boolean isMcsValid = userService.checkUserIsValid(userId, 11);
        return R.ok(isShopValid || isConvenientValid || isMcsValid);
    }*/


    /**
     * 保存评价
     * @return
     */
    public R saveEvaluate(){
        return R.ok();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerEvaluateDAO.java

@@ -1,15 +1,41 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerEvaluateDTO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerEvaluateVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerEvaluateDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @ClassName:  ComShopFlowerEvaluateMapper
 * @ClassName: ComShopFlowerEvaluateMapper
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: TODO
 * @Description: 评价
 */
@Mapper
public interface ComShopFlowerEvaluateDAO extends BaseMapper<ComShopFlowerEvaluateDO> {
    /**
     * 分页查询评价
     *
     * @param page
     * @param pageComShopFlowerEvaluateDTO
     * @return
     */
    IPage<ComShopFlowerEvaluateVO> pageEvaluate(@Param("page") Page page, @Param("pageComShopFlowerEvaluateDTO") PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO);


    List<ComShopFlowerEvaluateVO> selectListLimit(@Param("goodsId") Long goodsId);

    /**
     * 根据订单id查询评价
     *
     * @param orderNo
     * @return
     */
    ComShopFlowerEvaluateVO selectByOrderNo(@Param("orderNo") String orderNo);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderGoodsDAO.java

@@ -3,13 +3,21 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderGoodsDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * @ClassName:  ComShopFlowerOrderGoodsMapper
 * @ClassName: ComShopFlowerOrderGoodsMapper
 * @Author: yh
 * @Date: 2022/11/9 16:46
 * @Description: TODO
 */
@Mapper
public interface ComShopFlowerOrderGoodsDAO extends BaseMapper<ComShopFlowerOrderGoodsDO> {
    /**
     * 统计商店的总销量
     *
     * @param storeId
     * @return
     */
    Integer selectSumAmount(@Param("storeId") Long storeId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerUserAddressDAO.java

@@ -1,8 +1,14 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.shop.ComShopUserAddressVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerUserAddressDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @ClassName: ComShopFlowerUserAddressMapper
@@ -12,4 +18,11 @@
 */
@Mapper
public interface ComShopFlowerUserAddressDAO extends BaseMapper<ComShopFlowerUserAddressDO> {


    @Select("select id,`name`,phone,province_code,province_name,city_code,city_name"
            + ",district_code,district_name,detail_address,is_default "
            + " from com_shop_flower_user_address where delete_status = 2 and user_id = #{userId} order by create_at desc")
    List<ComShopUserAddressVO> pageUserAddressList(Page page, @Param("userId") Long userId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerUserAddressDO.java

@@ -106,4 +106,12 @@
    @TableField(value = "delete_status")
    private Integer deleteStatus;


    /**
     * 是否是默认地址(1.是 2.否)
     */
    public interface isDefault {
        int yes = 1;
        int no = 2;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java

@@ -4,6 +4,7 @@
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
@@ -131,4 +132,14 @@
     * 手机号
     */
    private String mobilePhone;

    /**
     * 店铺销量
     */
    private Integer sale;

    /**
     * 店铺销售额
     */
    private BigDecimal saleVolume;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerEvaluateService.java

New file
@@ -0,0 +1,44 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.shop.ComShopFlowerEvaluateDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerEvaluateDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComShopFlowerEvaluateDO;
import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO;

/**
 * @auther yh
 * @create 2022-11-08 17:25:45
 * @describe 商品评价
 */
public interface ComShopFlowerEvaluateService extends IService<ComShopFlowerEvaluateDO> {

    /**
     * 保存评价
     * @param comShopFlowerEvaluateDTO
     * @return
     */
    R saveEvaluate(ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO);

    /**
     * 分页查询评价
     * @param pageComShopFlowerEvaluateDTO
     * @return
     */
    R pageEvaluate(PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO);

    /**
     * 评价详情
     * @param id
     * @return
     */
    R detailEvaluate(Long id);

    /**
     * 删除评价
     * @param id
     * @return
     */
    R deleteEvaluate(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerUserAddressService.java

New file
@@ -0,0 +1,53 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComShopFlowerUserAddressDO;
import com.panzhihua.service_community.model.dos.ComShopUserAddressDO;

/**
 * @auther yh
 * @create 2022-11-08 17:25:45
 * @describe 用户收货地址表服务类
 */
public interface ComShopFlowerUserAddressService extends IService<ComShopFlowerUserAddressDO> {

    /**
     * 查询用户收获地址列表
     * 
     * @param comShopAddressDTO
     *            请求参数
     * @return 用户收货地址列表
     */
    R shopUserAddressList(PageComShopAddressDTO comShopAddressDTO);

    /**
     * 用户添加书货地址
     * 
     * @param comShopAddressDTO
     *            请求参数
     * @return 添加结果
     */
    R shopAddUserAddress(ComShopAddressDTO comShopAddressDTO);

    /**
     * 用户修改收货地址
     * 
     * @param comShopAddressDTO
     *            请求参数
     * @return 修改结果
     */
    R shopEditUserAddress(ComShopAddressDTO comShopAddressDTO);

    /**
     * 用户删除收货地址
     * 
     * @param addressId
     *            收货地址id
     * @return 删除结果
     */
    R shopDelUserAddress(Long addressId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientElevatingPointService.java

@@ -49,4 +49,11 @@
     * @return
     */
    R detailPoint(Long pointId);

    /**
     * 根据商家查询范围内的提货点
     * @param merchantId
     * @return
     */
    R findPointByMerchantId(Long merchantId,String lat,String lng);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerEvaluateServiceImpl.java

New file
@@ -0,0 +1,56 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.shop.ComShopFlowerEvaluateDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFlowerEvaluateDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ComShopFlowerEvaluateVO;
import com.panzhihua.service_community.dao.ComShopFlowerEvaluateDAO;
import com.panzhihua.service_community.model.dos.ComShopFlowerEvaluateDO;
import com.panzhihua.service_community.service.ComShopFlowerEvaluateService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.util.Date;

/**
 * @auther yh
 * @create 2022-11-08 17:25:45
 * @describe 商品评价
 */
@Slf4j
@Service
public class ComShopFlowerEvaluateServiceImpl extends ServiceImpl<ComShopFlowerEvaluateDAO, ComShopFlowerEvaluateDO>
    implements ComShopFlowerEvaluateService {


    @Override
    public R saveEvaluate(ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO) {
        ComShopFlowerEvaluateDO comShopFlowerEvaluateDO = new ComShopFlowerEvaluateDO();
        BeanUtils.copyProperties(comShopFlowerEvaluateDO,comShopFlowerEvaluateDTO);
        //评价时间
        comShopFlowerEvaluateDO.setEvaluateTime(new Date());
        this.baseMapper.insert(comShopFlowerEvaluateDO);
        return R.ok();
    }

    @Override
    public R pageEvaluate(PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO) {
        Page page = new Page<>(pageComShopFlowerEvaluateDTO.getPageNum(),pageComShopFlowerEvaluateDTO.getPageSize());
        IPage<ComShopFlowerEvaluateVO> comShopFlowerEvaluateVOIPage = this.baseMapper.pageEvaluate(page,pageComShopFlowerEvaluateDTO);
        return R.ok(comShopFlowerEvaluateVOIPage);
    }

    @Override
    public R detailEvaluate(Long id) {
        return R.ok(this.baseMapper.selectById(id));
    }

    @Override
    public R deleteEvaluate(Long id) {
        return R.ok(this.baseMapper.deleteById(id));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java

@@ -16,14 +16,10 @@
import com.panzhihua.common.utlis.DifferentLongListUtil;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComShopFlowerGoodsAttrDAO;
import com.panzhihua.service_community.dao.ComShopFlowerGoodsDAO;
import com.panzhihua.service_community.dao.ConvenientGoodsCategoryDAO;
import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComShopFlowerGoodsAttrService;
import com.panzhihua.service_community.service.ComShopFlowerGoodsService;
import com.panzhihua.service_community.service.ConvenientGoodsCategoryService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -53,6 +49,10 @@
    private ConvenientMerchantDAO convenientMerchantDAO;
    @Resource
    private ConvenientGoodsCategoryDAO convenientGoodsCategoryDAO;
    @Resource
    private ComShopFlowerOrderGoodsDAO comShopFlowerOrderGoodsDAO;
    @Resource
    private ComShopFlowerEvaluateDAO comShopFlowerEvaluateDAO;

    @Override
    public R saveShopFlowerGoods(AddShopFlowerGoodsVO addShopFlowerGoodsVO) {
@@ -160,7 +160,8 @@
        IPage<ComShopFlowerGoodsVO> goodsVOIPage = this.baseMapper.pageShopGoodByApps(page, comShopFlowerGoodsDTO);
        if (!goodsVOIPage.getRecords().isEmpty()) {
            goodsVOIPage.getRecords().forEach(goodsVo -> {
                List<ComShopFlowerGoodsAttrVO> goodsAttrList = shopFlowerGoodsAttrDAO.getGoodsAttr(goodsVo.getId());
                Long goodsId = goodsVo.getId();
                List<ComShopFlowerGoodsAttrVO> goodsAttrList = shopFlowerGoodsAttrDAO.getGoodsAttr(goodsId);
                if (!goodsAttrList.isEmpty()) {
                    ComShopFlowerGoodsAttrVO comShopFlowerGoodsAttrVO = goodsAttrList.get(0);
                    goodsVo.setGoodsAttrList(goodsAttrList);
@@ -168,6 +169,7 @@
                    goodsVo.setOriginalPrice(comShopFlowerGoodsAttrVO.getPrice());
                    goodsVo.setPrice(comShopFlowerGoodsAttrVO.getCollatePrice());
                }

            });
        }
        return R.ok(goodsVOIPage);
@@ -209,6 +211,10 @@
        shopGoods.setGoodsAttrList(goodsAttrList);
        shopGoods.setConvenientMerchantVO(convenientMerchantVO);
        shopGoods.setImages(StringUtils.join(images,","));
        Integer orderNum = comShopFlowerOrderGoodsDAO.selectCount(new LambdaQueryWrapper<ComShopFlowerOrderGoodsDO>().eq(ComShopFlowerOrderGoodsDO::getGoodsId, goodsId));
        shopGoods.setOrderNum(orderNum);
        List<ComShopFlowerEvaluateVO> comShopFlowerEvaluateVOList = comShopFlowerEvaluateDAO.selectListLimit(goodsId);
        shopGoods.setShopFlowerEvaluateVOList(comShopFlowerEvaluateVOList);
        return R.ok(shopGoods);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.utlis.DateUtils;
@@ -16,7 +17,6 @@
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComShopFlowerOrderService;
import com.panzhihua.service_community.service.ComShopOrderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -31,6 +31,8 @@
import java.util.Date;
import java.util.List;

import static java.util.Objects.nonNull;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
@@ -42,25 +44,29 @@
    implements ComShopFlowerOrderService {

    @Resource
    private ComShopFlowerGoodsDAO comShopGoodsDAO;
    private ComShopFlowerGoodsDAO comShopFlowerGoodsDAO;
    @Resource
    private ComShopFlowerGoodsAttrDAO comShopGoodsAttrDAO;
    private ComShopFlowerGoodsAttrDAO comShopFlowerGoodsAttrDAO;
    @Resource
    private ComShopCartDAO comShopCartDAO;
    @Resource
    private ComShopStoreDAO comShopStoreDAO;
    @Resource
    private ConvenientMerchantDAO convenientMerchantDAO;
    @Resource
    private ComShopFlowerUserAddressDAO comShopUserAddressDAO;
    private ComShopFlowerUserAddressDAO comShopFlowerUserAddressDAO;
    @Resource
    private ComShopFlowerOrderOperateDAO comShopOrderOperateDAO;
    private ComShopFlowerOrderOperateDAO comShopFlowerOrderOperateDAO;
    @Resource
    private ComShopFlowerOrderGoodsDAO comShopOrderGoodsDAO;
    private ComShopFlowerOrderGoodsDAO comShopFlowerOrderGoodsDAO;
    @Resource
    private ComShopFlowerOrderDAO comShopOrderDAO;
    private ComShopFlowerOrderDAO comShopFlowerOrderDAO;
    @Resource
    private ComShopFlowerOrderPayDAO comShopOrderPayDAO;
    private ComShopFlowerOrderPayDAO comShopFlowerOrderPayDAO;
    @Resource
    private ConvenientElevatingPointDAO convenientElevatingPointDAO;
    @Resource
    private ComShopFlowerEvaluateDAO comShopFlowerEvaluateDAO;


    @Value("${min.app.isTest}")
    private Boolean isTest;
    @Value("${min.app.appid}")
@@ -98,7 +104,7 @@
        if (orderPreviewDTO.getSubmitType().equals(ComShopOrderPreviewDTO.submitType.details)) {// 详情页提交
            // 查询商品信息
            ComShopFlowerGoodsDO goodsDO =
                comShopGoodsDAO.selectOne(new QueryWrapper<ComShopFlowerGoodsDO>().eq("id", orderPreviewDTO.getGoodsId())
                comShopFlowerGoodsDAO.selectOne(new QueryWrapper<ComShopFlowerGoodsDO>().eq("id", orderPreviewDTO.getGoodsId())
                    .eq("status", ComShopGoodsDO.status.sell).eq("delete_status", ComShopGoodsDO.deleteStatus.no));
            if (goodsDO == null) {
                return R.fail("商品已下架或已删除");
@@ -107,9 +113,12 @@
            storeId = goodsDO.getStoreId();

            // 查询商品规格信息
            ComShopFlowerGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(orderPreviewDTO.getGoodsAttrId());
            ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(orderPreviewDTO.getGoodsAttrId());
            if (goodsAttrDO == null) {
                return R.fail("商品规格不存在");
            }
            if (goodsAttrDO.getSale() < orderPreviewDTO.getBuyNum()){
                return R.fail("该规格库存不足，无法下单");
            }

            orderTotal = goodsAttrDO.getPrice().multiply(BigDecimal.valueOf(orderPreviewDTO.getBuyNum()));
@@ -140,7 +149,7 @@
                orderGoodsVO.setNum(cartDO.getAmount());
                orderGoodsVO.setGoodsName(cartDO.getGoodsName());
                // 查询商品规格
                ComShopFlowerGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(cartDO.getGoodsAttrId());
                ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(cartDO.getGoodsAttrId());
                if (goodsAttrDO != null) {
                    orderGoodsVO.setPrice(goodsAttrDO.getPrice());
                } else {
@@ -164,7 +173,7 @@

        // 查询默认收货地址
        ComShopFlowerUserAddressDO userDefaultAddressDO =
            comShopUserAddressDAO.selectOne(new QueryWrapper<ComShopFlowerUserAddressDO>().eq("delete_status", 2)
            comShopFlowerUserAddressDAO.selectOne(new QueryWrapper<ComShopFlowerUserAddressDO>().eq("delete_status", 2)
                .eq("user_id", orderPreviewDTO.getUserId()).eq("is_default", ComShopUserAddressDO.isDefault.yes));

        // 查询用户收货地址中的默认地址
@@ -179,7 +188,7 @@
                .eq("delete_status", 2).eq("user_id", orderPreviewDTO.getUserId()).orderByDesc("create_at"));
            if (shopOrders != null && shopOrders.size() > 0) {
                ComShopFlowerUserAddressDO userAddressDO =
                    comShopUserAddressDAO.selectById(shopOrders.get(0).getReceiverId());
                    comShopFlowerUserAddressDAO.selectById(shopOrders.get(0).getReceiverId());
                if (userAddressDO != null) {
                    ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
                    BeanUtils.copyProperties(userAddressDO, userAddressVO);
@@ -204,7 +213,7 @@
        // 创建返回参数
        ComShopFlowerOrderVO shopOrderVO = new ComShopFlowerOrderVO();
        // 查询用户收货地址
        ComShopFlowerUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(orderCreateDTO.getReceiverId());
        ComShopFlowerUserAddressDO userAddressDO = comShopFlowerUserAddressDAO.selectById(orderCreateDTO.getReceiverId());
        if (userAddressDO == null || userAddressDO.getDeleteStatus() != 2) {
            return R.fail("收货地址不存在");
        }
@@ -224,7 +233,7 @@
            for (ComShopOrderCreateGoodsDTO createGoodsDTO : orderCreateDTO.getOrderGoodsList()) {
                // 查询当前商品信息
                ComShopFlowerGoodsDO goodsDO =
                    comShopGoodsDAO.selectOne(new QueryWrapper<ComShopFlowerGoodsDO>().eq("id", createGoodsDTO.getGoodsId())
                    comShopFlowerGoodsDAO.selectOne(new QueryWrapper<ComShopFlowerGoodsDO>().eq("id", createGoodsDTO.getGoodsId())
                        .eq("delete_status", ComShopGoodsDO.deleteStatus.no).eq("status", ComShopGoodsDO.status.sell));
                if (goodsDO == null) {
                    log.error("未查询到商品信息,商品已下架活已删除,商品id" + createGoodsDTO.getGoodsId());
@@ -240,11 +249,15 @@
                orderGoodsDO.setAmount(createGoodsDTO.getNum());
                orderGoodsDO.setOrderNo(orderNo);
                // 查询当前商品规格
                ComShopFlowerGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(createGoodsDTO.getGoodsAttrId());
                ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(createGoodsDTO.getGoodsAttrId());
                if (goodsAttrDO == null) {
                    log.error(
                        "未查询到商品规格信息,商品id" + createGoodsDTO.getGoodsId() + "商品规格id:" + createGoodsDTO.getGoodsAttrId());
                    continue;
                }

                if (goodsAttrDO.getSale() < createGoodsDTO.getNum()){
                    return R.fail("该规格库存不足，无法下单");
                }
                orderGoodsDO.setGoodsAttrId(goodsAttrDO.getId());
                orderGoodsDO.setGoodsAttrPrice(goodsAttrDO.getPrice());
@@ -274,6 +287,7 @@
        shopOrderDO.setTotalAmount(orderTotal);
        shopOrderDO.setDiscountAmount(BigDecimal.ZERO);
        shopOrderDO.setDeliveryType(deliveryType);
        shopOrderDO.setPointId(orderCreateDTO.getPointId());
        if (StringUtils.isNotEmpty(orderCreateDTO.getRemark())) {
            shopOrderDO.setRemark(orderCreateDTO.getRemark());
        }
@@ -281,7 +295,7 @@
        if (!orderGoodsDOList.isEmpty()) {
            orderGoodsDOList.forEach(orderGoods -> {
                orderGoods.setOrderId(shopOrderDO.getId());
                comShopOrderGoodsDAO.insert(orderGoods);
                comShopFlowerOrderGoodsDAO.insert(orderGoods);
            });
        }
        // 创建订单操作记录
@@ -296,7 +310,7 @@
            orderOperateDO.setOperationContent("用户下单");
            orderOperateDO.setOperationBy("用户");
        }
        comShopOrderOperateDAO.insert(orderOperateDO);
        comShopFlowerOrderOperateDAO.insert(orderOperateDO);
        shopOrderVO.setOrderNo(orderNo);
        shopOrderVO.setOrderTotal(orderTotal);
        shopOrderVO.setOrderId(shopOrderDO.getId());
@@ -332,14 +346,14 @@
            orderPageVOIPage.getRecords().forEach(orderVo -> {
                List<ComShopFlowerOrderGoodsVO> orderGoodsVOS = new ArrayList<>();
                // 查询订单下商品信息
                List<ComShopFlowerOrderGoodsDO> orderGoodsDOList = comShopOrderGoodsDAO
                List<ComShopFlowerOrderGoodsDO> orderGoodsDOList = comShopFlowerOrderGoodsDAO
                    .selectList(new QueryWrapper<ComShopFlowerOrderGoodsDO>().eq("order_no", orderVo.getOrderNo()));
                if (!orderGoodsDOList.isEmpty()) {
                    orderGoodsDOList.forEach(orderGoods -> {
                        ComShopFlowerOrderGoodsVO orderGoodsVO = new ComShopFlowerOrderGoodsVO();
                        BeanUtils.copyProperties(orderGoods, orderGoodsVO);
                        // 根据商品规格id查询商品规格
                        ComShopFlowerGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
                        ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
                        if (goodsAttrDO != null) {
                            orderGoodsVO.setGoodsAttr(goodsAttrDO.getGoodsAttrName());
                        }
@@ -392,7 +406,7 @@

        List<ComShopFlowerOrderGoodsVO> orderGoodsVOS = new ArrayList<>();
        // 查询订单下商品信息
        List<ComShopFlowerOrderGoodsDO> orderGoodsDOList = comShopOrderGoodsDAO
        List<ComShopFlowerOrderGoodsDO> orderGoodsDOList = comShopFlowerOrderGoodsDAO
            .selectList(new QueryWrapper<ComShopFlowerOrderGoodsDO>().eq("order_no", shopOrderDO.getOrderNo()));
        StringBuilder sbr = new StringBuilder();
        if (!orderGoodsDOList.isEmpty()) {
@@ -403,7 +417,7 @@
                orderGoodsVO.setGoodsPic(orderGoods.getGoodsAttrPic());
                orderGoodsVO.setPrice(orderGoods.getGoodsAttrPrice());
                // 查询商品信息判断商品状态
                ComShopFlowerGoodsDO goodsDO = comShopGoodsDAO.selectById(orderGoods.getGoodsId());
                ComShopFlowerGoodsDO goodsDO = comShopFlowerGoodsDAO.selectById(orderGoods.getGoodsId());
                if (goodsDO == null || goodsDO.getDeleteStatus().equals(ComShopFlowerGoodsDO.deleteStatus.yes)
                    || goodsDO.getDeleteStatus().equals(ComShopFlowerGoodsDO.status.recovery)) {
                    orderGoodsVO.setGoodsStatus(ComShopFlowerOrderGoodsVO.goodsStatus.ysc);
@@ -414,7 +428,7 @@
                }

                // 根据商品规格id查询商品规格
                ComShopFlowerGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
                ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
                if (goodsAttrDO != null) {
                    orderGoodsVO.setGoodsAttr(goodsAttrDO.getGoodsAttrName());
                }
@@ -427,7 +441,7 @@

        ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
        // 查询用户收货地址
        ComShopFlowerUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(shopOrderDO.getReceiverId());
        ComShopFlowerUserAddressDO userAddressDO = comShopFlowerUserAddressDAO.selectById(shopOrderDO.getReceiverId());
        if (userAddressDO != null) {
            BeanUtils.copyProperties(userAddressDO, userAddressVO);
            orderVO.setUserAddressVO(userAddressVO);
@@ -435,7 +449,7 @@

        // 操作日志
        List<ComShopFlowerOrderOperateDO> listOperLog =
            comShopOrderOperateDAO.selectList(new LambdaQueryWrapper<ComShopFlowerOrderOperateDO>()
            comShopFlowerOrderOperateDAO.selectList(new LambdaQueryWrapper<ComShopFlowerOrderOperateDO>()
                .eq(ComShopFlowerOrderOperateDO::getOrderNo, shopOrderDO.getOrderNo()));
        List<ComShopFlowerOrderOperateVO> listOperLogVO = new ArrayList<>(listOperLog.size());
        listOperLog.forEach(logDO -> {
@@ -444,6 +458,23 @@
            listOperLogVO.add(copyVO);
        });
        orderVO.setLogs(listOperLogVO);
        Long pointId = shopOrderDO.getPointId();
        if (null!= pointId){
            ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(pointId);
            ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
            BeanUtils.copyProperties(convenientElevatingPointVO,convenientElevatingPointDO);
            orderVO.setConvenientElevatingPointVO(convenientElevatingPointVO);
        }
        //已完成、已退款才有评论
        if (ComShopFlowerOrderDO.status.ywc == shopOrderDO.getStatus() || ComShopFlowerOrderDO.status.ytk == shopOrderDO.getStatus()){
            ComShopFlowerEvaluateVO comShopFlowerEvaluateVO =  comShopFlowerEvaluateDAO.selectByOrderNo(shopOrderDO.getOrderNo());
            if (nonNull(comShopFlowerEvaluateVO)){
                orderVO.setComShopFlowerEvaluateVO(comShopFlowerEvaluateVO);
            }
        }



        return R.ok(orderVO);
    }

@@ -480,7 +511,7 @@
                orderOperateDO.setOperationContent("用户取消订单");
                orderOperateDO.setOperationBy("用户");
            }
            comShopOrderOperateDAO.insert(orderOperateDO);
            comShopFlowerOrderOperateDAO.insert(orderOperateDO);
            return R.ok();
        } else {
            return R.fail("取消订单失败");
@@ -551,7 +582,7 @@
                orderOperateDO.setOperationContent("用户确认收货");
                orderOperateDO.setOperationBy("用户");
            }
            comShopOrderOperateDAO.insert(orderOperateDO);
            comShopFlowerOrderOperateDAO.insert(orderOperateDO);
            return R.ok();
        } else {
            return R.fail("确认收货失败");
@@ -603,7 +634,7 @@
     */
    @Override
    public R shipOrder(ComShopOrderShipDTO orderShipDTO) {
        ComShopFlowerOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderShipDTO.getOrderId());
        ComShopFlowerOrderDO comShopOrderDO = comShopFlowerOrderDAO.selectById(orderShipDTO.getOrderId());
        if (comShopOrderDO == null) {
            return R.fail("订单不存在");
        }
@@ -621,7 +652,7 @@
        comShopOrderDO.setDeliveryTime(Calendar.getInstance().getTime());
        comShopOrderDO.setLogisticsCompany(orderShipDTO.getLogisticsCompany());
        comShopOrderDO.setLogisticsNo(orderShipDTO.getLogisticsNo());
        int updated = comShopOrderDAO.updateById(comShopOrderDO);
        int updated = comShopFlowerOrderDAO.updateById(comShopOrderDO);
        if (updated == 1) {
            // 创建订单操作记录
            ComShopFlowerOrderOperateDO orderOperateDO = new ComShopFlowerOrderOperateDO();
@@ -635,7 +666,7 @@
                orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount() + "已发货");
                orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
            }
            int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
            int inserted = comShopFlowerOrderOperateDAO.insert(orderOperateDO);
            if (inserted != 1) {
                log.error("订单发货日志保存错误");
            }
@@ -646,7 +677,7 @@

    @Override
    public R deliverOrder(ComShopOrderDeliverDTO orderDeliverDTO) {
        ComShopFlowerOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderDeliverDTO.getOrderId());
        ComShopFlowerOrderDO comShopOrderDO = comShopFlowerOrderDAO.selectById(orderDeliverDTO.getOrderId());
        if (comShopOrderDO == null) {
            return R.fail("订单不存在");
        }
@@ -661,7 +692,7 @@
        comShopOrderDO.setDeliveryType(1);
        comShopOrderDO.setStatus(3);
        comShopOrderDO.setDeliveryTime(Calendar.getInstance().getTime());
        int updated = comShopOrderDAO.updateById(comShopOrderDO);
        int updated = comShopFlowerOrderDAO.updateById(comShopOrderDO);
        if (updated == 1) {

            // 创建订单操作记录
@@ -676,7 +707,7 @@
                orderOperateDO.setOperationContent(orderDeliverDTO.getOperUserAccount() + "已发货");
                orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
            }
            int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
            int inserted = comShopFlowerOrderOperateDAO.insert(orderOperateDO);
            if (inserted != 1) {
                log.error("订单发货日志保存错误");
            }
@@ -687,7 +718,7 @@

    @Override
    public R finishDeliverOrder(ComShopOrderDeliverDTO orderDeliverDTO) {
        ComShopFlowerOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderDeliverDTO.getOrderId());
        ComShopFlowerOrderDO comShopOrderDO = comShopFlowerOrderDAO.selectById(orderDeliverDTO.getOrderId());
        if (comShopOrderDO == null) {
            return R.fail("订单不存在");
        }
@@ -699,7 +730,7 @@
        }
        // comShopOrderDO.setStatus(4);
        comShopOrderDO.setDeliveryStatus(5);
        int updated = comShopOrderDAO.updateById(comShopOrderDO);
        int updated = comShopFlowerOrderDAO.updateById(comShopOrderDO);
        if (updated == 1) {
            // 创建订单操作记录
            ComShopFlowerOrderOperateDO orderOperateDO = new ComShopFlowerOrderOperateDO();
@@ -713,7 +744,7 @@
                orderOperateDO.setOperationContent("订单已完成");
                orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
            }
            int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
            int inserted = comShopFlowerOrderOperateDAO.insert(orderOperateDO);
            if (inserted != 1) {
                log.error("订单发货日志保存错误");
            }
@@ -832,33 +863,35 @@

        // 查询订单商品
        List<ComShopFlowerOrderGoodsDO> orderGoodsList =
            comShopOrderGoodsDAO.selectList(new QueryWrapper<ComShopFlowerOrderGoodsDO>().lambda()
            comShopFlowerOrderGoodsDAO.selectList(new QueryWrapper<ComShopFlowerOrderGoodsDO>().lambda()
                .eq(ComShopFlowerOrderGoodsDO::getOrderNo, shopOrderDO.getOrderNo()));
        if (!orderGoodsList.isEmpty()) {
            int goodsNub = 0;
            for (ComShopFlowerOrderGoodsDO orderGood : orderGoodsList) {
                goodsNub += orderGood.getAmount();
                // 更新商品信息
                ComShopFlowerGoodsDO goodsDO = comShopGoodsDAO.selectById(orderGood.getGoodsId());
                ComShopFlowerGoodsDO goodsDO = comShopFlowerGoodsDAO.selectById(orderGood.getGoodsId());
                if (goodsDO != null) {
                    goodsDO.setSale(goodsDO.getSale() + orderGood.getAmount());
                    comShopGoodsDAO.updateById(goodsDO);
                    comShopFlowerGoodsDAO.updateById(goodsDO);
                }

                // 更新商品规格
                ComShopFlowerGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(orderGood.getGoodsAttrId());
                ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(orderGood.getGoodsAttrId());
                if (goodsAttrDO != null) {
                    goodsAttrDO.setSale(goodsAttrDO.getSale() + orderGood.getAmount());
                    comShopGoodsAttrDAO.updateById(goodsAttrDO);
                    //减库存
                    goodsAttrDO.setStock(goodsAttrDO.getStock() - orderGood.getAmount());
                    comShopFlowerGoodsAttrDAO.updateById(goodsAttrDO);
                }
            }

            // 更新店铺销量以及销售额
            ComShopStoreDO storeDO = comShopStoreDAO.selectById(shopOrderDO.getStoreId());
            ConvenientMerchantDO storeDO = convenientMerchantDAO.selectById(shopOrderDO.getStoreId());
            if (storeDO != null) {
                storeDO.setSale(storeDO.getSale() + goodsNub);
                storeDO.setSaleVolume(storeDO.getSaleVolume().add(shopOrderDO.getTotalAmount()));
                comShopStoreDAO.updateById(storeDO);
                convenientMerchantDAO.updateById(storeDO);
            }
        }

@@ -869,7 +902,7 @@
        orderOperateDO.setOperationTime(new Date());
        orderOperateDO.setOperationContent("用户支付订单");
        orderOperateDO.setOperationBy("用户");
        comShopOrderOperateDAO.insert(orderOperateDO);
        comShopFlowerOrderOperateDAO.insert(orderOperateDO);

        // 添加订单支付记录表
        ComShopFlowerOrderPayDO orderPayDO = new ComShopFlowerOrderPayDO();
@@ -879,7 +912,7 @@
        orderPayDO.setPayStatus(ComShopFlowerOrderPayDO.payStatus.yes);
        orderPayDO.setPayAmount(shopOrderDO.getPayAmount());
        orderPayDO.setPayTime(shopOrderDO.getPayTime());
        comShopOrderPayDAO.insert(orderPayDO);
        comShopFlowerOrderPayDAO.insert(orderPayDO);
    }

    /**
@@ -893,7 +926,7 @@
        // 创建返回参数
        ComShopFlowerOrderVO shopOrderVO = new ComShopFlowerOrderVO();
        // 查询订单
        ComShopFlowerOrderDO orderDO = comShopOrderDAO.selectOne(
        ComShopFlowerOrderDO orderDO = comShopFlowerOrderDAO.selectOne(
            new QueryWrapper<ComShopFlowerOrderDO>().lambda().eq(ComShopFlowerOrderDO::getOrderNo, orderPayDTO.getOrderNo()));
        if (orderDO == null) {
            return R.fail("订单不存在");

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerUserAddressServiceImpl.java

New file
@@ -0,0 +1,132 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComShopFlowerUserAddressDAO;
import com.panzhihua.service_community.dao.ComShopUserAddressDAO;
import com.panzhihua.service_community.model.dos.ComShopFlowerUserAddressDO;
import com.panzhihua.service_community.model.dos.ComShopUserAddressDO;
import com.panzhihua.service_community.service.ComShopFlowerUserAddressService;
import com.panzhihua.service_community.service.ComShopUserAddressService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

/**
 * @auther yh
 * @create 2022-11-08 17:25:45
 * @describe 用户收货地址表服务实现类
 */
@Slf4j
@Service
public class ComShopFlowerUserAddressServiceImpl extends ServiceImpl<ComShopFlowerUserAddressDAO, ComShopFlowerUserAddressDO>
    implements ComShopFlowerUserAddressService {

    /**
     * 查询用户收获地址列表
     * 
     * @param comShopAddressDTO
     *            请求参数
     * @return 用户收货地址列表
     */
    @Override
    public R shopUserAddressList(PageComShopAddressDTO comShopAddressDTO) {
        Page page = new Page<>(comShopAddressDTO.getPageNum(), comShopAddressDTO.getPageSize());
        return R.ok(this.baseMapper.pageUserAddressList(page, comShopAddressDTO.getUserId()));
    }

    /**
     * 用户添加收货地址
     * 
     * @param comShopAddressDTO
     *            请求参数
     * @return 添加结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R shopAddUserAddress(ComShopAddressDTO comShopAddressDTO) {
        ComShopFlowerUserAddressDO userAddressDO = new ComShopFlowerUserAddressDO();
        BeanUtils.copyProperties(comShopAddressDTO, userAddressDO);

        // 如果新增的地址为默认地址，需要修改原来的默认地址为不默认
        if (userAddressDO.getIsDefault().equals(ComShopFlowerUserAddressDO.isDefault.yes)) {
            ComShopFlowerUserAddressDO oldUserAddressDO = this.baseMapper.selectOne(new QueryWrapper<ComShopFlowerUserAddressDO>()
                .eq("user_id", comShopAddressDTO.getUserId()).eq("is_default", ComShopFlowerUserAddressDO.isDefault.yes));
            if (oldUserAddressDO != null) {
                oldUserAddressDO.setIsDefault(ComShopFlowerUserAddressDO.isDefault.no);
                this.baseMapper.updateById(oldUserAddressDO);
            }
        }

        if (this.baseMapper.insert(userAddressDO) > 0) {
            return R.ok();
        } else {
            return R.fail("添加收货地址失败");
        }
    }

    /**
     * 用户修改收货地址
     * 
     * @param comShopAddressDTO
     *            请求参数
     * @return 修改结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R shopEditUserAddress(ComShopAddressDTO comShopAddressDTO) {

        // 查询用户收货地址
        ComShopFlowerUserAddressDO userAddressDO = this.baseMapper.selectById(comShopAddressDTO.getAddressId());
        if (userAddressDO == null) {
            return R.fail("未查询到用户收货地址信息");
        }

        BeanUtils.copyProperties(comShopAddressDTO, userAddressDO);
        // 如果要修改的地址为默认地址，需要修改原来的默认地址为不默认
        if (comShopAddressDTO.getIsDefault().equals(ComShopFlowerUserAddressDO.isDefault.yes)) {
            ComShopFlowerUserAddressDO oldUserAddressDO = this.baseMapper.selectOne(new QueryWrapper<ComShopFlowerUserAddressDO>()
                .eq("user_id", comShopAddressDTO.getUserId()).eq("is_default", ComShopFlowerUserAddressDO.isDefault.yes));
            if (oldUserAddressDO != null) {
                // 判断当前要修改的默认地址是否本来就是默认地址
                if (!oldUserAddressDO.getId().equals(userAddressDO.getId())) {
                    oldUserAddressDO.setIsDefault(ComShopFlowerUserAddressDO.isDefault.no);
                    this.baseMapper.updateById(oldUserAddressDO);
                }
            }
        }

        if (this.baseMapper.updateById(userAddressDO) > 0) {
            return R.ok();
        } else {
            return R.fail("添加收货地址失败");
        }
    }

    /**
     * 用户删除收货地址
     * 
     * @param addressId
     *            收货地址id
     * @return 删除结果
     */
    public R shopDelUserAddress(Long addressId) {
        // 查询用户收货地址
        ComShopFlowerUserAddressDO userAddressDO = this.baseMapper.selectById(addressId);
        if (userAddressDO == null) {
            return R.fail("未查询到用户收货地址信息");
        }
        userAddressDO.setDeleteStatus(1);
        if (this.baseMapper.updateById(userAddressDO) > 0) {
            return R.ok();
        } else {
            return R.fail("删除收货地址失败");
        }
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java

@@ -1,33 +1,33 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientElevatingPointDTO;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientElevatingPointDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ConvenientElevatingPointDAO;
import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ConvenientElevatingPointDO;
import com.panzhihua.service_community.model.dos.ConvenientMerchantDO;
import com.panzhihua.service_community.model.dos.ConvenientServiceCategoryDO;
import com.panzhihua.service_community.service.ConvenientElevatingPointService;
import com.panzhihua.service_community.util.MapDistance;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
import static org.apache.commons.lang3.StringUtils.isNotBlank;

/**
 * @ClassName: ConvenientElevatingPointServiceImpl
@@ -40,9 +40,12 @@
public class ConvenientElevatingPointServiceImpl extends ServiceImpl<ConvenientElevatingPointDAO, ConvenientElevatingPointDO> implements ConvenientElevatingPointService {
    @Resource
    private ComActDAO comActDAO;
    @Resource
    private ConvenientMerchantDAO convenientMerchantDAO;

    /**
     * 分页查询
     *
     * @param pageConvenientElevatingPointDTO
     * @return
     */
@@ -57,6 +60,7 @@

    /**
     * 新增
     *
     * @param convenientElevatingPointDTO
     * @return
     */
@@ -64,11 +68,11 @@
    @Transactional(rollbackFor = Exception.class)
    public R addPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO) {
        ConvenientElevatingPointDO convenientElevatingPointDO = new ConvenientElevatingPointDO();
        BeanUtils.copyProperties(convenientElevatingPointDTO,convenientElevatingPointDO);
        BeanUtils.copyProperties(convenientElevatingPointDTO, convenientElevatingPointDO);
        String communityId = convenientElevatingPointDTO.getCommunityId();
        if (nonNull(communityId)) {
            ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",")+1)));
            if(comActDO!=null){
            ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",") + 1)));
            if (comActDO != null) {
                convenientElevatingPointDO.setCommunityName(comActDO.getName());
            }
        }
@@ -78,6 +82,7 @@

    /**
     * 修改
     *
     * @param convenientElevatingPointDTO
     * @return
     */
@@ -91,8 +96,8 @@
        }
        String communityId = convenientElevatingPointDTO.getCommunityId();
        if (nonNull(communityId)) {
            ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",")+1)));
            if(comActDO!=null){
            ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",") + 1)));
            if (comActDO != null) {
                convenientElevatingPointDO.setCommunityName(comActDO.getName());
            }
        }
@@ -105,7 +110,7 @@
    @Override
    public R deletePoint(Long pointId, Long operator) {
        ConvenientElevatingPointDO convenientElevatingPointDO = this.baseMapper.selectById(pointId);
        if (convenientElevatingPointDO.getPrepareGoodsNum() > 0){
        if (convenientElevatingPointDO.getPrepareGoodsNum() > 0) {
            return R.fail("该提货点暂时无法删除！若想删除需保证待提货数量为0");
        }
        int result = this.baseMapper.deletePointById(pointId, operator);
@@ -120,4 +125,32 @@
        ConvenientElevatingPointDO convenientElevatingPointDO = this.baseMapper.selectById(pointId);
        return R.ok(convenientElevatingPointDO);
    }

    public R findPointByMerchantId(Long merchantId, String lat, String lng) {
        ConvenientMerchantDO convenientMerchantDO = convenientMerchantDAO.selectById(merchantId);
        //服务最远距离 km
        Integer serviceRange = convenientMerchantDO.getServiceRange();

        Map<Object, Object> around = MapDistance.getAround(convenientMerchantDO.getLat(), convenientMerchantDO.getLon(), serviceRange * 1000 + "");
        String maxLat = around.get("maxLat").toString();
        String minLat = around.get("minLat").toString();
        String minLng = around.get("minLng").toString();
        String maxLng = around.get("maxLng").toString();
        List<ConvenientElevatingPointDO> convenientElevatingPointDOS = this.baseMapper.selectList(
                new LambdaQueryWrapper<ConvenientElevatingPointDO>()
                        .ge(ConvenientElevatingPointDO::getLat, minLng)
                        .le(ConvenientElevatingPointDO::getLat, maxLng)
                        .ge(ConvenientElevatingPointDO::getLon, minLat)
                        .le(ConvenientElevatingPointDO::getLon, maxLat));
        List<ConvenientElevatingPointVO> convenientElevatingPointVOS = new ArrayList<>();
        convenientElevatingPointDOS.forEach(f -> {
            ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
            BeanUtils.copyProperties(f, convenientElevatingPointVO);
            Double distance = MapDistance.distanceOfTwoPoints(lng, lat, f.getLon(), f.getLat());
            convenientElevatingPointVO.setDistance(distance);
            convenientElevatingPointVOS.add(convenientElevatingPointVO);
        });
        return R.ok(convenientElevatingPointVOS);

    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/MapDistance.java

New file
@@ -0,0 +1,123 @@
package com.panzhihua.service_community.util;

import java.util.HashMap;
import java.util.Map;

/**
 * @ClassName: MapDistance
 * @Author: yh
 * @Date: 2022/11/11 15:21
 * @Description: 经纬度处理
 */
public class MapDistance {
    private static double EARTH_RADIUS = 6378.137;


    private static double rad(double d) {
        return d * Math.PI / 180.0;
    }

    private static final double EARTH_RADIUS1 = 6370996.81;

    // 弧度
    private static double radian(double d) {
        return d * Math.PI / 180.0;
    }

    public static Double distanceOfTwoPoints(String lat1Str, String lng1Str, String lat2Str, String lng2Str) {
        Double lat1 = Double.parseDouble(lat1Str);
        Double lng1 = Double.parseDouble(lng1Str);
        Double lat2 = Double.parseDouble(lat2Str);
        Double lng2 = Double.parseDouble(lng2Str);

        double radLat1 = radian(lat1);
        double radLat2 = radian(lat2);
        double a = radLat1 - radLat2;
        double b = radian(lng1) - radian(lng2);
        double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2)
                + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
        s = s * EARTH_RADIUS1;
        s = Math.round(s * 10000) / 10000;
        return s;
    }


    /**
     * 根据两个位置的经纬度，来计算两地的距离（单位为KM）
     * 参数为String类型
     * @return
     */
    public static String getDistance(String lat1Str, String lng1Str, String lat2Str, String lng2Str) {
        Double lat1 = Double.parseDouble(lat1Str);
        Double lng1 = Double.parseDouble(lng1Str);
        Double lat2 = Double.parseDouble(lat2Str);
        Double lng2 = Double.parseDouble(lng2Str);
        double patm = 2;
        double radLat1 = rad(lat1);
        double radLat2 = rad(lat2);
        double difference = radLat1 - radLat2;
        double mdifference = rad(lng1) - rad(lng2);
        double distance = patm * Math.asin(Math.sqrt(Math.pow(Math.sin(difference / patm), patm)
                + Math.cos(radLat1) * Math.cos(radLat2)
                * Math.pow(Math.sin(mdifference / patm), patm)));
        distance = distance * EARTH_RADIUS;
        String distanceStr = String.valueOf(distance);
        return distanceStr;
    }

    /**
     * 获取当前用户一定距离以内的经纬度值
     * 单位米 return minLat
     * 最小经度 minLng
     * 最小纬度 maxLat
     * 最大经度 maxLng
     * 最大纬度 minLat
     */
    public static Map<Object,Object> getAround(String latStr, String lngStr, String raidus) {
        Map<Object,Object> map = new HashMap<Object,Object>();

        Double latitude = Double.parseDouble(latStr);// 传值给经度
        Double longitude = Double.parseDouble(lngStr);// 传值给纬度

        Double degree = (24901 * 1609) / 360.0; // 获取每度
        double raidusMile = Double.parseDouble(raidus);

        Double mpdLng = Double.parseDouble((degree * Math.cos(latitude * (Math.PI / 180))+"").replace("-", ""));
        Double dpmLng = 1 / mpdLng;
        Double radiusLng = dpmLng * raidusMile;
        //获取最小经度
        Double minLat = longitude - radiusLng;
        // 获取最大经度
        Double maxLat = longitude + radiusLng;

        Double dpmLat = 1 / degree;
        Double radiusLat = dpmLat * raidusMile;
        // 获取最小纬度
        Double minLng = latitude - radiusLat;
        // 获取最大纬度
        Double maxLng = latitude + radiusLat;

        map.put("minLat", minLat+"");
        map.put("maxLat", maxLat+"");
        map.put("minLng", minLng+"");
        map.put("maxLng", maxLng+"");

        return map;
    }

    public static void main(String[] args) {
        //济南国际会展中心经纬度：117.11811  36.68484
        //趵突泉：117.00999000000002  36.66123
        //103.962128,30.57568
        //103.957232,30.636726
        System.out.println(getDistance("30.57568","103.962128","30.636726","103.957232"));

        //103.842654,30.560987
        System.out.println(getAround("103.842654", "30.560987", "5000"));
        //117.01028712333508(Double), 117.22593287666493(Double),
        //36.44829619896034(Double), 36.92138380103966(Double)

        distanceOfTwoPoints("30.57568","103.962128","30.636726","103.957232");
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerEvaluateDAO.xml

@@ -1,22 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComShopFlowerEvaluateDAO">
  <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerEvaluateDO">
    <!--@mbg.generated-->
    <!--@Table com_shop_flower_evaluate-->
    <id column="id" jdbcType="BIGINT" property="id" />
    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
    <result column="goods_id" jdbcType="VARCHAR" property="goodsId" />
    <result column="user_id" jdbcType="BIGINT" property="userId" />
    <result column="evaluate_time" jdbcType="TIMESTAMP" property="evaluateTime" />
    <result column="evaluate_type" jdbcType="TINYINT" property="evaluateType" />
    <result column="evaluate_content" jdbcType="VARCHAR" property="evaluateContent" />
    <result column="evaluate_pic" jdbcType="VARCHAR" property="evaluatePic" />
    <result column="create_at" jdbcType="TIMESTAMP" property="createAt" />
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, order_no, goods_id, user_id, evaluate_time, evaluate_type, evaluate_content, 
    evaluate_pic, create_at
  </sql>
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComShopFlowerEvaluateDO">
        <!--@mbg.generated-->
        <!--@Table com_shop_flower_evaluate-->
        <id column="id" jdbcType="BIGINT" property="id"/>
        <result column="order_no" jdbcType="VARCHAR" property="orderNo"/>
        <result column="goods_id" jdbcType="BIGINT" property="goodsId"/>
        <result column="user_id" jdbcType="BIGINT" property="userId"/>
        <result column="evaluate_time" jdbcType="TIMESTAMP" property="evaluateTime"/>
        <result column="evaluate_type" jdbcType="TINYINT" property="evaluateType"/>
        <result column="evaluate_content" jdbcType="VARCHAR" property="evaluateContent"/>
        <result column="evaluate_pic" jdbcType="VARCHAR" property="evaluatePic"/>
        <result column="create_at" jdbcType="TIMESTAMP" property="createAt"/>
    </resultMap>
    <sql id="Base_Column_List">
        <!--@mbg.generated-->
        id, order_no, goods_id, user_id, evaluate_time, evaluate_type, evaluate_content,
        evaluate_pic, create_at
    </sql>
    <select id="pageEvaluate" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerEvaluateVO">
        select * from com_shop_flower_evaluate where 1=1
        <if test="pageComShopFlowerEvaluateDTO.goodsId != null">
            and goods_id = #{pageComShopFlowerEvaluateDTO.goodsId}
        </if>
        <if test="pageComShopFlowerEvaluateDTO.orderId != null">
            and order_no = #{pageComShopFlowerEvaluateDTO.orderId}
        </if>
        <if test="pageComShopFlowerEvaluateDTO.userId != null">
            and user_id = #{pageComShopFlowerEvaluateDTO.userId}
        </if>
        <if test="pageComShopFlowerEvaluateDTO.evaluateType != null">
            and evaluate_type = #{pageComShopFlowerEvaluateDTO.evaluateType}
        </if>
    </select>
    <select id="selectListLimit" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerEvaluateVO">
        SELECT * FROM com_shop_flower_evaluate WHERE goods_id = #{goodsId} ORDER BY create_at LIMIT 3
    </select>
    <select id="selectByOrderNo" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerEvaluateVO">
        SELECT * FROM com_shop_flower_evaluate WHERE order_no = #{orderNo}
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsMapper.xml

@@ -60,8 +60,12 @@
    </select>
    <select id="pageShopGoodByApps" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsVO">
        select csg.id,csg.`name`,csg.store_id,csg.goods_pic,csg.images,csg.`status`,csg.sale,csg.original_price
        ,csg.price,csg.unit,csg.`order`,csg.stock,csg.details,csg.delivery_type, csg.create_at from com_shop_flower_goods as
        csg left join com_convenient_merchants as css on css.id = csg.store_id where 1=1 and csg.delete_status = 1 and
        ,csg.price,csg.unit,csg.`order`,csg.stock,csg.details,csg.delivery_type, csg.create_at,
        (SELECT count(fog.id) FROM com_shop_flower_order_goods as fog WHERE fog.goods_id = 1) as order_num
        from com_shop_flower_goods as csg
        left join com_convenient_merchants as css on css.id = csg.store_id
        left join  com_convenient_goods_scope as cgs on cgs.goods_id = csg.id
        where 1=1 and csg.delete_status = 1 and
        css.`business_status` = 0
        <if test='comShopFlowerGoodsDTO.name != null and comShopFlowerGoodsDTO.name !=&quot;&quot;'>
            AND csg.`name` like concat('%',#{comShopFlowerGoodsDTO.name},'%')
@@ -70,6 +74,7 @@
        <if test='comShopFlowerGoodsDTO.storeId != null '>AND csg.store_id = #{comShopFlowerGoodsDTO.storeId}</if>
        <if test='comShopFlowerGoodsDTO.status != null '>AND csg.status = #{comShopFlowerGoodsDTO.status}</if>
        <if test='comShopFlowerGoodsDTO.deliveryType != null '>AND csg.delivery_type = #{comShopFlowerGoodsDTO.deliveryType}</if>
        <if test='comShopFlowerGoodsDTO.categoriesId != null '>AND cgs.goods_category_id = #{comShopFlowerGoodsDTO.categoriesId}</if>
        order by sale desc,create_at desc
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderGoodsDAO.xml

@@ -27,4 +27,7 @@
    amount, goods_attr_price, goods_attr_pic, price, free_shipping_price, collate_price, 
    goods_name, create_at
  </sql>
    <select id="selectSumAmount" resultType="java.lang.Integer">
     SELECT sum(amount) FROM `com_shop_flower_order_goods`  WHERE store_id = #{storeId}
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -331,6 +331,14 @@
            return R.fail();
        }
        LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
        //获取后台商家user
        SysUserDO sysUser = userDao.selectOne(
                new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 5).eq(SysUserDO::getPhone, sysUserDO.getPhone()).eq(SysUserDO::getAppId, appId));
        //判断是否是商家账号
        if (nonNull(sysUser)){
            loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
            loginUserInfoVO.setBackstageType(5);
        }
        if (nonNull(sysUserDO.getStreetId())){
            loginUserInfoVO.setStreetId(sysUserDO.getStreetId());
        }
@@ -525,6 +533,14 @@
                loginUserInfoVO.setIsDpcMember(1);
            }
        }
        //获取后台商家user
        SysUserDO sysUser = userDao.selectOne(
                new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 5).eq(SysUserDO::getPhone, sysUserDO.getPhone()).eq(SysUserDO::getAppId, "wx118de8a734d269f0"));
        //判断是否是商家账号
        if (nonNull(sysUser)){
            loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
            loginUserInfoVO.setBackstageType(5);
        }
        return R.ok(loginUserInfoVO);
    }