Merge remote-tracking branch 'origin/master'

cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java

@@ -61,6 +61,15 @@ public class AuthorizationController {
         return CzgResult.success(authorizationService.login(loginDTO));
     }
 
+    /**
+     * 退出登录
+     */
+    @PostMapping("logout")
+    public CzgResult<?> logout() {
+        StpKit.USER.logout();
+        return CzgResult.success();
+    }
+
     @GetMapping("/permission")
     public CzgResult<?> getPermission() {
         return CzgResult.success();

cash-api/product-server/src/main/java/com/czg/controller/user/HomeController.java

@@ -1,8 +1,11 @@
 package com.czg.controller.user;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.czg.account.vo.home.HomePageVO;
 import com.czg.product.service.HomePageService;
+import com.czg.product.vo.RecommendProVO;
 import com.czg.resp.CzgResult;
+import com.mybatisflex.core.paginate.Page;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,8 +22,12 @@ public class HomeController {
     @Resource
     private HomePageService homePageService;
 
+    /**
+     * 主页上部分
+     * 快捷菜单区域 今日上新 飙升热榜 免单信息
+     */
     @GetMapping("/homePageUp")
-    public CzgResult<?> homePageUp() {
+    public CzgResult<HomePageVO> homePageUp() {
        return CzgResult.success(homePageService.getHomeInfo());
     }
 
@@ -29,13 +36,13 @@ public class HomeController {
      * @param lng 纬度
      * @param lat 经度
      * @param address 城市
-     * @param classify 分类 0双人餐 1饮品明细 2咖啡饮品
+     * @param categoryId 分类 0双人餐 1饮品明细 2咖啡饮品
      * @param orderType 排序规则 0离我最近 1销量优先 2价格优先
-     * @param distanceType 1一千米
+     * @param distanceType 1000m 2000m
      * @return 商品列表
      */
     @GetMapping("/product")
-    public CzgResult<?> home(String lng, String lat, String address, Integer classify, Integer orderType, Integer distanceType) {
+    public CzgResult<Page<RecommendProVO>> home(String lng, String lat, String address, Integer categoryId, Integer orderType, Integer distanceType) {
-        return CzgResult.success(homePageService.getProd(lng, lat, address, classify, orderType, distanceType));
+        return CzgResult.success(homePageService.getProd(lng, lat, address, categoryId, orderType, distanceType));
     }
 }

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserFlowService.java

@@ -3,6 +3,8 @@ package com.czg.account.service;
 import com.czg.account.entity.ShopUserFlow;
 import com.mybatisflex.core.service.IService;
 
+import java.math.BigDecimal;
+
 /**
  * 用户余额流水 服务层。
  *
@@ -11,4 +13,5 @@ import com.mybatisflex.core.service.IService;
  */
 public interface ShopUserFlowService extends IService<ShopUserFlow> {
 
+   void updateRefund(Long id, BigDecimal refundAmount);
 }

cash-common/cash-common-service/src/main/java/com/czg/product/service/HomePageService.java

@@ -1,6 +1,8 @@
 package com.czg.product.service;
 
 import com.czg.account.vo.home.HomePageVO;
+import com.czg.product.vo.RecommendProVO;
+import com.mybatisflex.core.paginate.Page;
 
 /**
  * @author Administrator
@@ -8,6 +10,6 @@ import com.czg.account.vo.home.HomePageVO;
 public interface HomePageService {
     HomePageVO getHomeInfo();
 
-    Object getProd(String lng, String lat, String address, Integer classify, Integer orderType, Integer distanceType);
+    Page<RecommendProVO> getProd(String lng, String lat, String address, Integer classify, Integer orderType, Integer distanceType);
 
 }

cash-common/cash-common-service/src/main/java/com/czg/product/vo/RecommendProVO.java

@@ -0,0 +1,65 @@
+package com.czg.product.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class RecommendProVO {
+    /**
+     * 距离单位km
+     */
+    private double distance;
+    /**
+     * 商品名称
+     */
+    private String name;
+    /**
+     * 原始价格
+     */
+    private BigDecimal originPrice;
+    /**
+     * 售卖价格
+     */
+    private BigDecimal salePrice;
+    /**
+     * 商品图片
+     */
+    private String coverImg;
+    /**
+     * 店铺名称
+     */
+    private String shopName;
+    /**
+     * 市区
+     */
+    private String districts;
+    /**
+     * 店铺logo
+     */
+    private String logo;
+    /**
+     * 商品id
+     */
+    private Long productId;
+    /**
+     * skuId
+     */
+    private Long skuId;
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+    /**
+     * 销售量
+     */
+    private Long saleNum;
+    /**
+     * 折扣
+     */
+    private float discount;
+    private Long endTime = 1741391999999L;
+}

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserFlowServiceImpl.java

@@ -3,9 +3,12 @@ package com.czg.service.account.service.impl;
 import com.czg.account.entity.ShopUserFlow;
 import com.czg.account.service.ShopUserFlowService;
 import com.czg.service.account.mapper.ShopUserFlowMapper;
+import com.mybatisflex.core.update.UpdateChain;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import org.apache.dubbo.config.annotation.DubboService;
 
+import java.math.BigDecimal;
+
 /**
  * 用户余额流水 服务层实现。
  *
@@ -15,4 +18,11 @@ import org.apache.dubbo.config.annotation.DubboService;
 @DubboService
 public class ShopUserFlowServiceImpl extends ServiceImpl<ShopUserFlowMapper, ShopUserFlow> implements ShopUserFlowService {
 
+    @Override
+    public void updateRefund(Long id, BigDecimal refundAmount) {
+        UpdateChain.of(ShopUserFlow.class)
+                .setRaw(ShopUserFlow::getRefundAmount, "refund_amount + " + refundAmount)
+                .eq(ShopUserFlow::getId, id)
+                .update();
+    }
 }

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java

@@ -241,7 +241,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             throw new ValidateException("生成支付订单失败，该店铺未开启积分抵扣");
         }
         orderInfo.setSeatNum(param.getSeatNum());
-        if (shopInfo.getIsTableFee() != 0 && shopInfo.getTableFee().compareTo(BigDecimal.ZERO) != 0) {
+        if (shopInfo.getIsTableFee() != 1 && shopInfo.getTableFee().compareTo(BigDecimal.ZERO) != 0) {
             orderInfo.setSeatAmount(new BigDecimal(param.getSeatNum()).multiply(shopInfo.getTableFee()));
         } else {
             orderInfo.setSeatAmount(BigDecimal.ZERO);

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java

@@ -471,16 +471,9 @@ public class PayServiceImpl implements PayService {
                 .build();
         //更新会员余额 并生成流水
         shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO);
-
+        userFlowService.updateRefund(inFlow.getId(), refPayParam.getRefAmount());
-        UpdateChain.of(ShopUserFlow.class)
-                .setRaw(ShopUserFlow::getRefundAmount, "refund_amount" + refPayParam.getRefAmount())
-                .eq(ShopUserFlow::getId, inFlow.getId())
-                .update();
         if (giftFlow != null) {
-            UpdateChain.of(ShopUserFlow.class)
+            userFlowService.updateRefund( giftFlow.getId(), giftFlow.getAmount());
-                    .setRaw(ShopUserFlow::getRefundAmount, "refund_amount" + giftFlow.getAmount())
-                    .eq(ShopUserFlow::getId, giftFlow.getId())
-                    .update();
         }
         //移除优惠券
         inRecordService.remove(QueryWrapper.create()

cash-service/product-service/src/main/java/com/czg/service/product/mapper/ProductMapper.java

@@ -2,6 +2,7 @@ package com.czg.service.product.mapper;
 
 import com.czg.product.dto.ProductDTO;
 import com.czg.product.entity.Product;
+import com.czg.product.vo.RecommendProVO;
 import com.czg.product.vo.ShopProductInfoVo;
 import com.czg.product.vo.ShopProductVo;
 import com.mybatisflex.core.BaseMapper;
@@ -37,4 +38,8 @@ public interface ProductMapper extends BaseMapper<Product> {
     List<Product> selectCouponProBySaleNum();
 
     void updateProductStockNum(@Param("id") Long id, @Param("shopId") Long shopId, @Param("type") String type, @Param("num") BigDecimal num);
+
+    List<RecommendProVO> selectRecommendProductList(@Param("lng") String lng, @Param("lat") String lat, @Param("address") String address,
+                                                    @Param("classify") Integer classify, @Param("orderType") Integer orderType,
+                                                    @Param("distanceType") Integer distanceType);
 }

cash-service/product-service/src/main/java/com/czg/service/product/service/impl/HomePageServiceImpl.java

@@ -15,10 +15,13 @@ import com.czg.enums.LogoEnum;
 import com.czg.product.entity.Product;
 import com.czg.product.service.ProdSkuService;
 import com.czg.product.service.ProductService;
+import com.czg.product.vo.RecommendProVO;
 import com.czg.service.product.mapper.ProductMapper;
 import com.czg.utils.JoinQueryWrapper;
+import com.czg.utils.PageUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
@@ -107,14 +110,8 @@ public class HomePageServiceImpl implements HomePageService {
     }
 
     @Override
-    public Object getProd(String lng, String lat, String address, Integer classify, Integer orderType, Integer distanceType) {
+    public Page<RecommendProVO> getProd(String lng, String lat, String address, Integer classify, Integer orderType, Integer distanceType) {
-        QueryWrapper queryWrapper = new QueryWrapper();
+        PageHelper.startPage(PageUtil.buildPageHelp());
-        if (StrUtil.isNotBlank(address)) {
+        return PageUtil.convert(new PageInfo<>(productMapper.selectRecommendProductList(lng, lat, address, classify, orderType, distanceType)));
-            queryWrapper.and(JoinQueryWrapper.column(ShopInfo::getCities).like(address).or(JoinQueryWrapper.column(ShopInfo::getDistricts).like(address)));
-        }
-        if (classify != null) {
-            queryWrapper.eq(Product::getCategoryId, classify);
-        }
-        return null;
     }
 }

cash-service/product-service/src/main/resources/mapper/ProductMapper.xml

@@ -94,7 +94,7 @@
                t1.pack_fee
         from tb_product t1
                  left join (select x.product_id,
-                                   x.id as sku_id,
+                                   x.id              as sku_id,
                                    MIN(x.sale_price) as sale_price,
                                    x.origin_price,
                                    x.member_price,
@@ -104,7 +104,7 @@
                               and x.is_grounding = 1
                               and x.shop_id = #{shopId}
                             group by x.product_id) t2 on t1.id = t2.product_id
-        left join tb_shop_prod_unit t3 on t1.unit_id = t3.id
+                 left join tb_shop_prod_unit t3 on t1.unit_id = t3.id
     </sql>
     <select id="selectProductPage" resultType="com.czg.product.dto.ProductDTO">
         <include refid="productQuery"/>
@@ -160,6 +160,37 @@
         ORDER BY b.real_sales_number
         LIMIT 2
     </select>
+    <select id="selectRecommendProductList" resultType="com.czg.product.vo.RecommendProVO">
+        select ROUND(
+        ST_Distance_Sphere(POINT(b.lng, b.lat), POINT(#{lng}, #{lat})) / 1000, 2) AS distance,
+            c.name, a.origin_price, a.sale_price, b.shop_name, b.districts, c.cover_img, b.logo, c.id,
+            a.real_sales_number saleNum, round(a.sale_price / a.origin_price, 2) discount,
+        c.id productId, a.id skuId, b.id shopId
+        from tb_prod_sku as a
+        left join tb_product c on c.id=a.product_id
+        left join tb_shop_info as b on a.shop_id=b.id
+        where c.id is not null
+        <if test="address != null and address != ''">
+            and (b.cities like concat('%', #{address}, '%') or b.districts like concat('%', #{address}, '%'))
+        </if>
+        <if test="classify != null">
+            and c.category_id = #{classify}
+        </if>
+        <if test="distanceType != null">
+            and ST_Distance_Sphere(POINT(b.lng, b.lat), POINT(#{lng}, #{lat})) &lt;= #{distanceType}
+        </if>
+        <if test="orderType == 0">
+            ORDER BY distance
+        </if>
+        <if test="orderType == 1">
+            ORDER BY a.real_sales_number desc
+        </if>
+
+        <if test="orderType == 2">
+            ORDER BY a.sale_price
+        </if>
+
+    </select>
     <update id="updateProductStockNum">
         update tb_product
         <if test="type == 'add'">
@@ -169,7 +200,7 @@
             set stock_number = stock_number - #{num}
         </if>
         where id = #{id}
-          and is_stock = 1
+        and is_stock = 1
-          and shop_id = #{shopId}
+        and shop_id = #{shopId}
     </update>
 </mapper>