订单

alien-entity/src/main/java/shop/alien/entity/store/LifeCoupon.java

@@ -20,6 +20,22 @@ public class LifeCoupon {
     @TableId(value = "id", type = IdType.AUTO)
     private String id;
 
+    @ApiModelProperty(value = "数据类型: 0:正式数据, 1:草稿数据")
+    @TableField("data_type")
+    private Integer dataType;
+
+    @ApiModelProperty(value = "购买须知-使用开始时间")
+    @TableField("buy_use_start_time")
+    private String buyUseStartTime;
+
+    @ApiModelProperty(value = "购买须知-使用结束时间")
+    @TableField("buy_use_end_time")
+    private String buyUseEndTime;
+
+    @ApiModelProperty(value = "可用节假日")
+    @TableField("use_festival")
+    private String useFestival;
+
     @ApiModelProperty(value = "券id")
     @TableField("coupon_code")
     private String couponCode;

alien-entity/src/main/java/shop/alien/entity/store/LifeGroupBuyMain.java

@@ -247,4 +247,5 @@ public class LifeGroupBuyMain {
     @ApiModelProperty(value = "修改人ID")
     @TableField("updated_user_id")
     private Integer updatedUserId;
+
 }

alien-entity/src/main/java/shop/alien/entity/store/LifeUserOrder.java

@@ -46,7 +46,7 @@ public class LifeUserOrder {
     private Date refundTime;
 
     /**
-     * 购买类型(订单类型，0，代金券；1，团购订单)
+     * 购买类型(订单类型，1，代金券；2，团购订单)
      */
     private Integer couponType;
 

alien-entity/src/main/java/shop/alien/entity/store/dto/LifeUserOrderDto.java

@@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -43,7 +42,7 @@ public class LifeUserOrderDto {
     @ApiModelProperty(value = "团购/代金券id")
     private Integer couponId;
 
-    @ApiModelProperty(value = "购买类型(订单类型，0，代金券；1，团购订单)")
+    @ApiModelProperty(value = "购买类型(订单类型，1，代金券；2，团购订单)")
     private Integer couponType;
 
     @ApiModelProperty(value = "原价")

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeGroupBuyThaliVo.java

@@ -224,7 +224,7 @@ public class LifeGroupBuyThaliVo {
      * 自动为用户补偿优惠券id
      */
     @ApiModelProperty(value = "自动为用户补偿优惠券id")
-    @TableField("coupon_id")
+
     private Integer couponId;
 
     @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
@@ -252,4 +252,5 @@ public class LifeGroupBuyThaliVo {
 
     @ApiModelProperty(value = "子信息")
     private List<LifeGroupBuyNameThaliVo> details;
+
 }

alien-entity/src/main/java/shop/alien/mapper/LifeUserOrderMapper.java

@@ -31,11 +31,11 @@ public interface LifeUserOrderMapper extends BaseMapper<LifeUserOrder> {
 
     @Select("with total_coupon as(\n" +
             "-- 团购\n" +
-            "\tselect id coupon_id,1 coupon_type,lgbm.group_name coupon_name, SUBSTRING_INDEX(image_id, ',', 1) AS image_id \n" +
+            "\tselect id coupon_id,2 coupon_type,lgbm.group_name coupon_name, SUBSTRING_INDEX(image_id, ',', 1) AS image_id,effective_date_type,effective_date_value \n" +
             "from life_group_buy_main lgbm where lgbm.delete_flag = 0\n" +
             "\tunion all\n" +
             "-- 代金券\n" +
-            "\tselect id coupon_id,0 coupon_type,lc.name coupon_name, SUBSTRING_INDEX(image_path, ',', 1) AS image_id \n" +
+            "\tselect id coupon_id,1 coupon_type,lc.name coupon_name, SUBSTRING_INDEX(image_path, ',', 1) AS image_id,0 effective_date_type,expiration_date effective_date_value \n" +
             "from life_coupon lc where lc.delete_flag = 0\n" +
             ")\n" +
             "select luo.id,luo.buy_time,luo.status,luo.price,luo.final_price,luo.user_id,luo.store_id,luo.order_no,luo.pay_time,luo.cancel_time,luo.finish_time,\n" +

alien-entity/src/main/java/shop/alien/mapper/ManagementInfoMapper.java

@@ -34,7 +34,7 @@ public interface ManagementInfoMapper {
 
     IPage<ManagementInfoVo> getApplicationForWithdrawal(IPage<ManagementInfoVo> iPage, @Param("storeId") Integer storeId, @Param("storeName") String storeName);
 
-    IPage<ManagementInfoVo> getStoreOrderDetail(IPage<ManagementInfoVo> iPage, @Param("storeId") String storeId);
+    IPage<ManagementInfoVo> getStoreOrderDetail(IPage<ManagementInfoVo> iPage, @Param("storeId") String storeId, @Param("orderNo") String orderNo, @Param("userId") String userId, @Param("userName") String userName);
 
     //获取平台净利润
     ManagementInfoVo getPlatformNetProfit(@Param("dataTime") String dataTime);
@@ -98,4 +98,10 @@ public interface ManagementInfoMapper {
 
     //获取退款金额
     ManagementInfoVo getRefundAmount(@Param("dataTime") String dataTime);
+
+    ManagementInfoVo getWithdrawalAmount(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("storeId") String storeId);
+    ManagementInfoVo getOrderAmount(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("storeId") String storeId);
+    ManagementInfoVo getTransactionAmount(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("storeId") String storeId);
+    ManagementInfoVo getWrittenOffAmount(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("storeId") String storeId);
+
 }

alien-entity/src/main/java/shop/alien/mapper/second/SecondTradeRecordMapper.java

@@ -24,7 +24,7 @@ import java.util.List;
 @Mapper
 public interface SecondTradeRecordMapper extends BaseMapper<SecondTradeRecord> {
 
-    @Select("select trade.id, goods.title, goods.home_image, goods.price, trade.transaction_amount, trade.trade_status, trade.transaction_time, " +
+    @Select("select trade.id, goods.title, goods.home_image, goods.price, trade.transaction_amount, trade.trade_status, trade.transaction_time, trade.seller_id, " +
             "       trade.transaction_latitude_longitude, trade.transaction_latitude_longitude_address, trade.transaction_location, trade.created_user_id, " +
             "       if (now() >= trade.transaction_time, 1, 0) timeOutFlag " +
             "from second_trade_record trade " +

alien-entity/src/main/resources/mapper/LifeUserOrderMapper.xml

@@ -57,11 +57,11 @@
     <!-- 查询用户订单详情 -->
     <select id="queryUserOrderDetail" resultMap="BaseResultMap">
         with total_coupon as(
-        select id coupon_id,1 coupon_type,lgbm.group_name coupon_name,preferential_price offprice,SUBSTRING_INDEX(image_id, ',', 1) AS image_id,
+        select id coupon_id,2 coupon_type,lgbm.group_name coupon_name,preferential_price offprice,SUBSTRING_INDEX(image_id, ',', 1) AS image_id,
                effective_date_type,effective_date_value,use_rules,reservation_rules,applicable_num,quota_type,quota_value
         from life_group_buy_main lgbm where lgbm.delete_flag = 0
         union all
-        select id coupon_id,0 coupon_type,lc.name coupon_name,lc.offprice offprice,SUBSTRING_INDEX(image_path, ',', 1) AS image_id,
+        select id coupon_id,1 coupon_type,lc.name coupon_name,lc.offprice offprice,SUBSTRING_INDEX(image_path, ',', 1) AS image_id,
                0 effective_date_type,expiration_date effective_date_value,use_rule use_rules,reservation_rules,applicable_num,1 quota_type,buy_limit quota_value
         from life_coupon lc where lc.delete_flag = 0
         )

alien-entity/src/main/resources/mapper/ManagementInfoMapper.xml

@@ -10,16 +10,16 @@
             store.store_name,
             IFNULL(meal.coupon_count, 0)  AS meal_coupon_count,
             IFNULL(meal.order_count, 0) AS meal_order_count,
-            ROUND(IFNULL(meal.order_amount, 0) / 100,2) AS meal_order_amount,
+            ROUND(IFNULL(meal.order_amount, 0) / 1000000,2) AS meal_order_amount,
             IFNULL(meal.income_count, 0) AS meal_income_count,
-            ROUND(IFNULL(meal.income_money, 0) / 100,2) AS meal_income_money,
+            ROUND(IFNULL(meal.income_money, 0) / 1000000,2) AS meal_income_money,
             IFNULL(coupon.coupon_count, 0) AS coupon_coupon_count,
             IFNULL(coupon.order_count, 0) AS coupon_order_count,
-            ROUND(IFNULL(coupon.order_amount, 0) / 100,2) AS coupon_order_amount,
+            ROUND(IFNULL(coupon.order_amount, 0) / 1000000,2) AS coupon_order_amount,
             IFNULL(coupon.income_count, 0) AS coupon_income_count,
-            ROUND(IFNULL(coupon.income_money, 0) / 100,2) AS coupon_income_money,
-            ROUND(IFNULL(allInfo.cash_out_money, 0) / 100,2) AS cashout_money,
-            ROUND(IFNULL(allInfo.account_frozen, 0) / 100,2) AS account_frozen
+            ROUND(IFNULL(coupon.income_money, 0) / 1000000,2) AS coupon_income_money,
+            ROUND(IFNULL(allInfo.cash_out_money, 0) / 1000000,2) AS cashout_money,
+            ROUND(IFNULL(allInfo.account_frozen, 0) / 1000000,2) AS account_frozen
         FROM
             store_info store
                 LEFT JOIN merchant_reconciliation_coupon coupon ON store.id = coupon.store_id
@@ -34,7 +34,7 @@
         SELECT
             store.id,
             store.store_name,
-            ROUND(IFNULL( sum( money ), 0 ) / 100,2) AS income_money
+            ROUND(IFNULL( sum( money ), 0 ) / 1000000,2) AS income_money
         FROM
             store_info store
                 LEFT JOIN ( SELECT * FROM store_income_details_record WHERE created_time > #{startDate} AND created_time < #{endDate} ) income ON store.id = income.store_id
@@ -63,6 +63,14 @@
             AND store_id = #{storeId}
         </if>
     </select>
+    <select id="getTransactionAmount" resultType="shop.alien.entity.store.vo.ManagementInfoVo">
+        SELECT
+        ROUND(IFNULL(SUM( money ),0) / 100,2) AS totalTransactionAmount
+        FROM
+        store_income_details_record income
+        WHERE
+        created_time > #{startDate} AND created_time &lt; #{endDate}
+    </select>
     <select id="getTransactionNumber" resultType="shop.alien.entity.store.vo.ManagementInfoVo">
         SELECT
         COUNT(1) AS transactionNumber
@@ -82,6 +90,14 @@
             AND store_id = #{storeId}
         </if>
     </select>
+    <select id="getOrderAmount" resultType="shop.alien.entity.store.vo.ManagementInfoVo">
+        SELECT
+        ROUND(IFNULL(SUM( final_price ),0) / 100,2) AS allOrderAmount
+        FROM
+        life_user_order
+        where
+        created_time > #{startDate} AND created_time &lt; #{endDate}
+    </select>
     <select id="getAllWrittenOffAmount" resultType="shop.alien.entity.store.vo.ManagementInfoVo">
         SELECT
             ROUND(IFNULL(SUM( money ),0) / 100,2) AS allWrittenOffAmount
@@ -93,6 +109,14 @@
             AND store_id = #{storeId}
         </if>
     </select>
+    <select id="getWrittenOffAmount" resultType="shop.alien.entity.store.vo.ManagementInfoVo">
+        SELECT
+        ROUND(IFNULL(SUM( money ),0) / 100,2) AS allWrittenOffAmount
+        FROM
+        store_income_details_record
+        where
+        created_time > #{startDate} AND created_time &lt; #{endDate}
+    </select>
     <select id="getTotalWithdrawalAmount" resultType="shop.alien.entity.store.vo.ManagementInfoVo">
         SELECT
             ROUND(IFNULL(SUM( money ),0) / 100,2) AS totalWithdrawalAmount
@@ -104,6 +128,14 @@
             AND store_id = #{storeId}
         </if>
     </select>
+    <select id="getWithdrawalAmount" resultType="shop.alien.entity.store.vo.ManagementInfoVo">
+        SELECT
+        ROUND(IFNULL(SUM( money ),0) / 100,2) AS totalWithdrawalAmount
+        FROM
+        store_cash_out_record cash
+        where payment_status = 1 and
+        created_time > #{startDate} AND created_time &lt; #{endDate}
+    </select>
     <select id="getStoreOrderDetail" resultType="shop.alien.entity.store.vo.ManagementInfoVo">
         SELECT
             userOrder.id,
@@ -115,7 +147,7 @@
                 WHEN 1 THEN
                     "代金券"
                 WHEN 2 THEN
-                    "团购"
+                    "套餐"
                 END AS type_name,
             coupon.`name`,
             "1" AS buy_count,
@@ -136,13 +168,23 @@
                     "待退款"
                 WHEN 4 THEN
                     "已退款"
-                END AS status_name
+                END AS status_name,
+        userOrder.order_no
         FROM
             life_user_order userOrder
                 LEFT JOIN life_coupon coupon ON coupon.id = userOrder.id
                 LEFT JOIN life_user userInfo ON userOrder.user_id = userInfo.id
         WHERE
             userOrder.store_id = #{storeId}
+        <if test = "orderNo != null and orderNo != ''" >
+            AND userOrder.order_no = #{orderNo}
+        </if >
+        <if test = "userId != null and userId != ''" >
+            AND userOrder.user_id = #{userId}
+        </if >
+        <if test = "userName != null and userName != ''" >
+            AND userInfo.user_name like concat('%',#{userName},'%')
+        </if >
     </select>
     <select id="getUserCount" resultType="shop.alien.entity.store.vo.ManagementInfoVo">
         SELECT

alien-entity/src/main/resources/mapper/second/SecondGoodsInfoMapper.xml

@@ -163,7 +163,7 @@
         ) a where rn <![CDATA[ <= ]]> 2
     </select>
 
-    <!-- 分页查询推荐数据 -->
+    <!-- 分页查询新发数据 -->
     <select id="querySecondNewGoodsByPage" resultType="shop.alien.entity.second.vo.SecondGoodsRecommendVo">
         with shieldUser as (
             select g.id from life_blacklist lb inner join second_goods g
@@ -209,7 +209,7 @@
             left join life_collect lc on lc.business_id = g.id and lc.user_id = #{phoneId} and lc.delete_flag = 0 and lc.business_type = 1
         where g.delete_flag = 0
             and not exists (select 1 from shieldUser s where s.id = g.id)
-            and not exists (select 1 from second_shield s where s.user_id = #{userId} and s.shield_type = 1 and s.shield_id = g.id)
+            and not exists (select 1 from second_shield s where s.user_id = #{userId} and s.shield_type = 1 and s.shield_id = g.id and s.delete_flag = 0)
             and g.goods_status = 3
             and g.position != '' and g.position is not null
         order by g.release_time desc

alien-job/src/main/java/shop/alien/job/store/LifeUserOrderJob.java

@@ -7,9 +7,14 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import shop.alien.entity.store.LifeCoupon;
+import shop.alien.entity.store.LifeGroupBuyMain;
 import shop.alien.entity.store.LifeUserOrder;
 import shop.alien.entity.store.OrderCouponMiddle;
+import shop.alien.mapper.LifeCouponMapper;
+import shop.alien.mapper.LifeGroupBuyMainMapper;
 import shop.alien.mapper.LifeUserOrderMapper;
 import shop.alien.mapper.OrderCouponMiddleMapper;
 import shop.alien.util.common.constant.OrderStatusEnum;
@@ -35,11 +40,13 @@ public class LifeUserOrderJob {
 
     private final LifeUserOrderMapper lifeUserOrderMapper;
     private final OrderCouponMiddleMapper orderCouponMiddleMapper;
-
+    private final LifeCouponMapper lifeCouponMapper;
+    private final LifeGroupBuyMainMapper lifeGroupBuyMainMapper;
     /**
      * 待支付订单超时处理
      */
     @XxlJob("autoCancelUnpaidOrders")
+    @Transactional(rollbackFor = Exception.class)
     public String autoCancelUnpaidOrders(){
         //1.查询待支付超时订单
         List<LifeUserOrder> lifeUserOrders = lifeUserOrderMapper.selectList(new LambdaQueryWrapper<LifeUserOrder>()
@@ -55,13 +62,50 @@ public class LifeUserOrderJob {
                 .set(LifeUserOrder::getCancelTime,LocalDateTime.now())
                 .set(LifeUserOrder::getCancelReason,"订单超时未支付")
                 .in(LifeUserOrder::getId,orderIds));
-        orderCouponMiddleMapper.selectList(new LambdaQueryWrapper<OrderCouponMiddle>()
+        // 根据类型分组
+        Map<Integer, List<String>> collect = lifeUserOrders.stream()
+                .collect(Collectors.groupingBy(
+                        LifeUserOrder::getCouponType,  // 按订单类型分组
+                        Collectors.mapping(  // 对每个分组中的元素提取ID
+                                LifeUserOrder::getId,
+                                Collectors.toList()
+                        )
+                ));
+        int updateNum = 0;
+        if(collect.containsKey(0)){
+            //3.1代金券订单
+            List<String> couponOrderIds = collect.get(0);
+            QueryWrapper<OrderCouponMiddle> queryWrapper = new QueryWrapper<OrderCouponMiddle>().in("order_id", couponOrderIds)
+                    .eq("status", OrderStatusEnum.WAIT_PAY.getStatus())
+                    .groupBy("coupon_id")  // 按coupon_id分组
+                    .select("coupon_id, COUNT(*) as count");  // 选择分组字段和统计数量
+            List<OrderCouponMiddle> orderCouponMiddles = orderCouponMiddleMapper.selectList(queryWrapper);
+            for (OrderCouponMiddle orderCouponMiddle : orderCouponMiddles) {
+                // 恢复库存
+                lifeCouponMapper.update(null, new LambdaUpdateWrapper<LifeCoupon>()
+                        .setSql("stock_qty=stock_qty+" + orderCouponMiddle.getCount())
+                        .eq(LifeCoupon::getId, orderCouponMiddle.getCouponId()));
+            }
+        }
+        if(collect.containsKey(1)){
+            //3.2团购订单
+            List<String> groupOrderIds = collect.get(1);
+            QueryWrapper<OrderCouponMiddle> queryWrapper = new QueryWrapper<OrderCouponMiddle>().in("order_id", groupOrderIds)
+                    .eq("status", OrderStatusEnum.WAIT_PAY.getStatus())
+                    .groupBy("coupon_id")  // 按coupon_id分组
+                    .select("coupon_id, COUNT(*) as count");
+            List<OrderCouponMiddle> orderCouponMiddles = orderCouponMiddleMapper.selectList(queryWrapper);
+            for (OrderCouponMiddle orderCouponMiddle : orderCouponMiddles) {
+                // 恢复库存
+                lifeGroupBuyMainMapper.update(null,new LambdaUpdateWrapper<LifeGroupBuyMain>()
+                        .setSql("inventory_num=inventory_num+" + orderCouponMiddle.getCount())
+                        .eq(LifeGroupBuyMain::getId, orderCouponMiddle.getCouponId()));
+            }
+        }
+        // 更新券状态
+        orderCouponMiddleMapper.update(null,new LambdaUpdateWrapper<OrderCouponMiddle>()
+                .set(OrderCouponMiddle::getStatus,OrderStatusEnum.CANCEL.getStatus())
                 .in(OrderCouponMiddle::getOrderId,orderIds));
-        List<Map<String, Object>> maps = orderCouponMiddleMapper.selectMaps(new QueryWrapper<OrderCouponMiddle>()
-                .select("coupon_id", "count(*) as count")
-                .in("order_id", orderIds)
-                .groupBy("coupon_id"));
-        //3.更改相对应的券状态
-        return null;
+        return "success";
     }
 }

alien-second/src/main/java/shop/alien/second/controller/UserGoodsController.java

@@ -146,7 +146,7 @@ public class UserGoodsController {
             @RequestParam(defaultValue = "10") Integer pageSize) {
         log.info("SecondGoodsController.getDraftList?page={},size={},", pageNum,pageSize);
         R<IPage<SecondGoodsVo>> result = new R<>();
-        IPage<SecondGoodsVo> page = new Page<>(pageNum, pageNum);
+        IPage<SecondGoodsVo> page = new Page<>(pageNum, pageSize);
         JSONObject data = JwtUtil.getCurrentUserInfo();
         if (null != data) {
             int userId = data.getInteger("userId");

alien-second/src/main/java/shop/alien/second/service/impl/SecondTradeRecordServiceImpl.java

@@ -63,7 +63,7 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
                 LambdaQueryWrapper<SecondTradeRecord> wrapper = new LambdaQueryWrapper<>();
                 wrapper.between(SecondTradeRecord::getCreatedTime, now + " 00:00:00", now + " 23:59:59");
                 int count = secondTradeRecordMapper.selectCount(wrapper);
-                String tradeNo = "S" + now.toString().replace("-", "") + String.format("%05d", count);
+                String tradeNo = "S" + now.toString().replace("-", "") + String.format("%05d", count + 1);
                 trade.setTradeNo(tradeNo);
             }
             // 保存交易记录
@@ -348,7 +348,9 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
             alienStoreFeign.sendMsgToClientByPhoneId(receiverId, JSONObject.from(webSocketVo).toJSONString());
 
             return true;
-        } catch (Exception e) {
+        } catch (BusinessException e) {
+            throw new BusinessException(e);
+        }  catch (Exception e) {
             log.error("SecondTradeRecordServiceImpl.tradeSignIn(): Error Msg={}", e.getMessage());
             throw new Exception(e);
         }

alien-store/src/main/java/shop/alien/store/config/GaoDeMapUtil.java

@@ -47,6 +47,9 @@ public class GaoDeMapUtil {
     @Value("${gaode.distanceUrl}")
     private String distanceUrl;
 
+    @Value("${gaode.distanceTypeUrl}")
+    private String distanceTypeUrl;
+
     @Value("${gaode.nearUrl}")
     private String nearUrl;
 
@@ -147,6 +150,38 @@ public class GaoDeMapUtil {
     }
 
     /**
+     * 计算两个经纬度的距离
+     *
+     * @param longitudeOne 经度1
+     * @param latitudeOne  纬度1
+     * @param longitudeTwo 经度2
+     * @param latitudeTwo  纬度2
+     * @return distance
+     */
+    public Double getDistanceStraightLine(String longitudeOne, String latitudeOne, String longitudeTwo, String latitudeTwo) {
+        try {
+            String urlString = String.format(distanceTypeUrl, key, longitudeOne, latitudeOne, longitudeTwo, latitudeTwo, 0);
+            JSONObject obj = getResponse(urlString);
+            if (null != obj && "1".equals(String.valueOf(obj.get("status")))) {
+                JSONArray resultsArray = obj.getJSONArray("results");
+                if (resultsArray != null && !resultsArray.isEmpty()) {
+                    JSONObject resultJSON = resultsArray.getJSONObject(0);
+                    return Double.parseDouble(resultJSON.getString("distance"));
+                } else {
+                    log.error("AddressLocationUtil.getDistance ERROR 计算距离失败，结果为空");
+                    return null;
+                }
+            } else {
+                log.error("AddressLocationUtil.getDistance ERROR 计算距离失败");
+                return null;
+            }
+        } catch (Exception e) {
+            log.error("AddressLocationUtil.getDistance ERROR {}", e.getMessage());
+            return null;
+        }
+    }
+
+    /**
      * 获取附近商家、建筑等信息
      *
      * @param longitude 经度

alien-store/src/main/java/shop/alien/store/config/WebSocketProcess.java

@@ -51,7 +51,6 @@ public class WebSocketProcess implements ApplicationContextAware {
     @Override
     public void setApplicationContext(ApplicationContext context) {
         WebSocketProcess.applicationContext = context;
-        // 初始化Mapper
         WebSocketProcess.lifeBlacklistMapper = context.getBean(LifeBlacklistMapper.class);
         WebSocketProcess.lifeMessageMapper = context.getBean(LifeMessageMapper.class);
         WebSocketProcess.baseRedisService = context.getBean(BaseRedisService.class);
@@ -63,140 +62,161 @@ public class WebSocketProcess implements ApplicationContextAware {
      **/
     private Session session;
 
-    /*
-     * 客户端创建连接时触发
-     * */
-    @OnOpen
-    public void onOpen(Session session, @PathParam("sendId") String id) {
-        //每新建立一个连接，就把当前客户id为key,this为value存储到map中
-        this.session = session;
-        concurrentHashMap.put(id, this);
-        log.info("WebSocketProcess.onOpen() Open a websocket. id={}", id);
-
-        // 获取拉黑自己的用户信息
-        LambdaQueryWrapper<LifeBlacklist> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(LifeBlacklist::getBlockedPhoneId, id);
-        List<String> blackList = lifeBlacklistMapper.selectList(wrapper).stream().map(LifeBlacklist::getBlockerPhoneId).collect(Collectors.toList());
-        if (CollectionUtil.isNotEmpty(blackList))
-            baseRedisService.setSaveOrOverwriteScriptList("blackList_" + id, blackList);
-    }
-
-
-    /**
-     * 客户端连接关闭时触发
-     **/
-    @OnClose
-    public void onClose(Session session, @PathParam("sendId") String id) {
-        //客户端连接关闭时，移除map中存储的键值对
-        concurrentHashMap.remove(id);
-        log.info("WebSocketProcess.onClose() close a websocket, concurrentHashMap remove sessionId= {}", id);
-        if (baseRedisService.hasKey("blackList_" + id)) baseRedisService.delete("blackList_" + id);
-    }
-
-    /**
-     * 连接发生异常时候触发
-     */
-    @OnError
-    public void onError(Session session, Throwable error) {
-        log.error("WebSocketProcess.onError() Error Mgs=", error);
-    }
-
     /**
      * 接收到客户端消息时触发
      */
     @OnMessage
-    public void onMessage(String message) throws Exception {
+    public void onMessage(@PathParam("sendId") String id, String message) throws Exception {
         try {
+            // 解析消息
+            WebSocketVo webSocketVo = JSONObject.parseObject(message, WebSocketVo.class);
+
             // 过滤心跳
-            WebSocketVo websocketVo = JSONObject.parseObject(message, WebSocketVo.class);
-            if (null == websocketVo || "heartbeat".equals(websocketVo.getCategory())) return;
+            if (null == webSocketVo || "heartbeat".equals(webSocketVo.getCategory())) return;
 
             // 记录已读消息id
-            if ("receipt".equals(websocketVo.getCategory())) {
-                baseRedisService.setListRight("readMessageIdKey", String.valueOf(websocketVo.getMessageId()));
+            if ("receipt".equals(webSocketVo.getCategory())) {
+                baseRedisService.setListRight("readMessageIdKey", String.valueOf(webSocketVo.getMessageId()));
                 return;
             }
 
             // 检查消息合规性
-            if (!checkCompliance(websocketVo)) {
-                websocketVo.setType("7");
-                websocketVo.setText("发送内容存在违规行为");
-                sendMessage(websocketVo.getSenderId(), JSONObject.from(websocketVo).toJSONString());
+            if (!checkCompliance(webSocketVo)) {
+                webSocketVo.setType("7");
+                webSocketVo.setText("发送内容存在违规行为");
+                sendMessage(webSocketVo.getSenderId(), JSONObject.from(webSocketVo).toJSONString());
                 return;
             }
 
-            log.info("websocketVo----------------{}",JSONObject.from(websocketVo).toJSONString());
-            log.info("concurrentHashMap----------{}",concurrentHashMap.keySet());
+            log.info("webSocketVo----------------{}", JSONObject.from(webSocketVo).toJSONString());
+            log.info("concurrentHashMap----------{}", concurrentHashMap.keySet());
 
             // 保存消息记录
             LifeMessage lifeMessage = new LifeMessage();
-            lifeMessage.setSenderId(websocketVo.getSenderId());
-            lifeMessage.setReceiverId(websocketVo.getReceiverId());
-            lifeMessage.setContent(websocketVo.getText());
-            lifeMessage.setType(websocketVo.getType());
+            lifeMessage.setSenderId(webSocketVo.getSenderId());
+            lifeMessage.setReceiverId(webSocketVo.getReceiverId());
+            lifeMessage.setContent(webSocketVo.getText());
+            lifeMessage.setType(webSocketVo.getType());
             // 查询自己是否在对方的黑名单中
-            if (baseRedisService.hasKey("blackList_" + websocketVo.getSenderId())) {
-                List<String> blackList = baseRedisService.getList("blackList_" + websocketVo.getSenderId());
-                if (blackList.contains(websocketVo.getReceiverId())) {
-                    lifeMessage.setDeletePhoneId(websocketVo.getReceiverId());
+            if (baseRedisService.hasKey("blackList_" + webSocketVo.getSenderId())) {
+                List<String> blackList = baseRedisService.getList("blackList_" + webSocketVo.getSenderId());
+                if (blackList.contains(webSocketVo.getReceiverId())) {
+                    lifeMessage.setDeletePhoneId(webSocketVo.getReceiverId());
                     lifeMessageMapper.insert(lifeMessage);
                     // 发送消息
-                    websocketVo.setMessageId(lifeMessage.getId());
-                    websocketVo.setCategory("message");
-                    websocketVo.setCreatedTime(lifeMessage.getCreatedTime());
-                    sendMessage(websocketVo.getSenderId(), JSONObject.from(websocketVo).toJSONString());
+                    webSocketVo.setMessageId(lifeMessage.getId());
+                    webSocketVo.setCategory("message");
+                    webSocketVo.setCreatedTime(lifeMessage.getCreatedTime());
+                    sendMessage(webSocketVo.getSenderId(), JSONObject.from(webSocketVo).toJSONString());
                     return;
                 }
             }
 
             lifeMessageMapper.insert(lifeMessage);
             // 发送消息
-            websocketVo.setMessageId(lifeMessage.getId());
-            websocketVo.setCategory("message");
-            websocketVo.setCreatedTime(lifeMessage.getCreatedTime());
-            sendMessage(websocketVo.getSenderId(), JSONObject.from(websocketVo).toJSONString());
-            sendMessage(websocketVo.getReceiverId(), JSONObject.from(websocketVo).toJSONString());
+            webSocketVo.setMessageId(lifeMessage.getId());
+            webSocketVo.setCategory("message");
+            webSocketVo.setCreatedTime(lifeMessage.getCreatedTime());
+            sendMessage(webSocketVo.getSenderId(), JSONObject.from(webSocketVo).toJSONString());
+            sendMessage(webSocketVo.getReceiverId(), JSONObject.from(webSocketVo).toJSONString());
+        } catch (Exception e) {
+            log.error("WebSocketProcess.onMessage()----Exception----Message={}", e.getMessage());
+        }
+    }
+
+    /**
+     * 发送消息到指定客户端
+     */
+    public void sendMessage(String id, String message) throws Exception {
+        try {
+            log.info("WebSocketProcess.sendMessage()--readySend----id={},message={}", id, message);
+            // 根据id,从map中获取存储的webSocket对象
+            WebSocketProcess webSocketProcess = concurrentHashMap.get(id);
+            if (!ObjectUtils.isEmpty(webSocketProcess)) {
+                // 当客户端是Open状态时，才能发送消息
+                if (webSocketProcess.session.isOpen()) {
+                    webSocketProcess.session.getBasicRemote().sendText(message);
+                    log.info("WebSocketProcess.sendMessage()---sendSuccess---id={},message={}", id, message);
+                } else {
+                    log.error("WebSocketProcess.sendMessage()---sendError----websocket session:{} is closed ", id);
+                }
+            } else {
+                log.error("WebSocketProcess.sendMessage()---sendError----websocket session:{} is not exit ", id);
+            }
+        } catch (Exception e) {
+            log.error("WebSocketProcess.sendMessage()---Exception----Message={}", e.getMessage());
+        }
+    }
+
+    /**
+     * 客户端创建连接时触发
+     * */
+    @OnOpen
+    public void onOpen(@PathParam("sendId") String id, Session session) {
+        try {
+            //每新建立一个连接，就把当前客户id为key,this为value存储到map中
+            this.session = session;
+            concurrentHashMap.put(id, this);
+            log.info("WebSocketProcess.onOpen() Open a websocket. id={}", id);
+
+            // 获取拉黑自己的用户信息
+            LambdaQueryWrapper<LifeBlacklist> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(LifeBlacklist::getBlockedPhoneId, id);
+            List<String> blackList = lifeBlacklistMapper.selectList(wrapper).stream().map(LifeBlacklist::getBlockerPhoneId).collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(blackList)) baseRedisService.setSaveOrOverwriteScriptList("blackList_" + id, blackList);
         } catch (Exception e) {
-            log.error("WebSocketProcess.onMessage()----error----Msg={}", e.getMessage());
+            log.error("WebSocketProcess.onOpen()----Exception----Message={}", e.getMessage());
         }
     }
 
 
-    private boolean checkCompliance(WebSocketVo websocketVo) throws Exception {
-        List<String> servicesList = Lists.newArrayList();
-        TextModerationResultVO textModerationResultVO = null;
-        if ("1".equals(websocketVo.getType())) {
-            servicesList.add(TextReviewServiceEnum.AD_COMPLIANCE_DETECTION_PRO.getService());
-            servicesList.add(TextReviewServiceEnum.CHAT_DETECTION_PRO.getService());
-            textModerationResultVO = textModerationUtil.invokeFunction(websocketVo.getText(), servicesList);
-
-        } else if ("2".equals(websocketVo.getType())) {
-            servicesList.add(ImageReviewServiceEnum.TONALITY_IMPROVE.getService());
-            textModerationResultVO = textModerationUtil.invokeFunction(websocketVo.getText(), servicesList);
+    /**
+     * 客户端连接关闭时触发
+     **/
+    @OnClose
+    public void onClose(Session session, @PathParam("sendId") String id) {
+        try {
+            //客户端连接关闭时，移除map中存储的键值对
+            concurrentHashMap.remove(id);
+            log.info("WebSocketProcess.onClose() close a websocket, concurrentHashMap remove sessionId= {}", id);
+            if (baseRedisService.hasKey("blackList_" + id)) baseRedisService.delete("blackList_" + id);
+        } catch (Exception e) {
+            log.error("WebSocketProcess.onClose()----Exception----Message={}", e.getMessage());
         }
-        if (null != textModerationResultVO && "high".equals(textModerationResultVO.getRiskLevel())) {
-            return false;
+    }
+
+    /**
+     * 连接发生异常时候触发
+     */
+    @OnError
+    public void onError(@PathParam("sendId") String id, Throwable error) {
+        try {
+            log.error("WebSocketProcess.onError() Error,id={}, Msg=", id, error);
+        } catch (Exception e) {
+            log.error("WebSocketProcess.onError()----Exception----Message={}", e.getMessage());
         }
-        return true;
     }
 
     /**
-     * 发送消息到指定客户端
+     * 验证消息合规性
      */
-    public void sendMessage(String id, String message) throws Exception {
-        log.info("WebSocketProcess.sendMessage()--ready----id={},message={}", id, message);
-        //根据id,从map中获取存储的webSocket对象
-        WebSocketProcess webSocketProcess = concurrentHashMap.get(id);
-        if (!ObjectUtils.isEmpty(webSocketProcess)) {
-            //当客户端是Open状态时，才能发送消息
-            if (webSocketProcess.session.isOpen()) {
-                webSocketProcess.session.getBasicRemote().sendText(message);
-                log.info("WebSocketProcess.sendMessage()---success---id={},message={}", id, message);
-            } else {
-                log.error("WebSocketProcess.sendMessage()---error----websocket session:{} is closed ", id);
+    private boolean checkCompliance(WebSocketVo websocketVo) throws Exception {
+        try {
+            List<String> servicesList = Lists.newArrayList();
+            TextModerationResultVO textModerationResultVO = null;
+            if ("1".equals(websocketVo.getType())) {
+                servicesList.add(TextReviewServiceEnum.AD_COMPLIANCE_DETECTION_PRO.getService());
+                servicesList.add(TextReviewServiceEnum.CHAT_DETECTION_PRO.getService());
+                textModerationResultVO = textModerationUtil.invokeFunction(websocketVo.getText(), servicesList);
+
+            } else if ("2".equals(websocketVo.getType())) {
+                servicesList.add(ImageReviewServiceEnum.TONALITY_IMPROVE.getService());
+                textModerationResultVO = textModerationUtil.invokeFunction(websocketVo.getText(), servicesList);
             }
-        } else {
-            log.error("WebSocketProcess.sendMessage()---error----websocket session:{} is not exit ", id);
+            return !(null != textModerationResultVO && "high".equals(textModerationResultVO.getRiskLevel()));
+        } catch (Exception e) {
+            log.error("WebSocketProcess.checkCompliance()----Exception----Message={}", e.getMessage());
+            return true;
         }
     }
 

alien-store/src/main/java/shop/alien/store/controller/GaoDeController.java

@@ -130,4 +130,16 @@ public class GaoDeController {
         return R.data(gaodeMapUtil.getDistance(longitudeOne, latitudeOne, longitudeTwo, latitudeTwo));
     }
 
+    @ApiOperation("获取两个经纬度的距离(直线距离)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "longitudeOne", value = "经度1", dataType = "String", paramType = "query", required = true),
+            @ApiImplicitParam(name = "latitudeOne", value = "纬度1", dataType = "String", paramType = "query", required = true),
+            @ApiImplicitParam(name = "longitudeTwo", value = "纬度2", dataType = "String", paramType = "query", required = true),
+            @ApiImplicitParam(name = "latitudeTwo", value = "纬度2", dataType = "String", paramType = "query", required = true)
+    })
+    @GetMapping("/getDistanceStraightLine")
+    public R<Double> getDistanceStraightLine(String longitudeOne, String latitudeOne, String longitudeTwo, String latitudeTwo) {
+        return R.data(gaodeMapUtil.getDistanceStraightLine(longitudeOne, latitudeOne, longitudeTwo, latitudeTwo));
+    }
+
 }

alien-store/src/main/java/shop/alien/store/controller/LifeBlacklistController.java

@@ -75,4 +75,12 @@ public class LifeBlacklistController {
             return R.data("取消拉黑成功");
         }
     }
+
+    @ApiOperation("双方是否存在拉黑关系")
+    @ApiOperationSupport(order = 5)
+    @GetMapping("/hasBlackList")
+    public R<Boolean> hasBlackList(String otherSidePhoneId) throws Exception {
+        log.info("LifeBlacklistController.hasBlackList?otherSidePhoneId={}", otherSidePhoneId);
+        return R.data(lifeBlacklistService.hasBlackList(otherSidePhoneId));
+    }
 }

alien-store/src/main/java/shop/alien/store/controller/LifeCouponController.java

@@ -36,21 +36,29 @@ public class LifeCouponController {
         return R.fail("失败");
     }
 
+    /**
+     * 修改库存数量
+     *
+     * @param id        主键
+     * @param singleQty 库存数量
+     * @return boolean
+     */
+    @ApiOperation("修改库存数量")
+    @GetMapping("/updateCouponSingleQty")
+    public R<Boolean> updateCouponSingleQty(@RequestParam("id") Integer id, @RequestParam("singleQty") Integer singleQty) {
+        log.info("LifeCouponController.updateCouponSingleQty?id={}&singleQty={}", id, singleQty);
+        if (lifeCouponService.updateCouponSingleQty(id, singleQty)) {
+            return R.success("成功");
+        }
+        return R.fail("失败");
+    }
+
     @ApiOperation("代金劵列表")
-    @ApiImplicitParams({@ApiImplicitParam(name = "page", value = "页数", dataType = "Integer", paramType = "query", required = true),
-            @ApiImplicitParam(name = "size", value = "页容", dataType = "Integer", paramType = "query", required = true),
-            @ApiImplicitParam(name = "storeId", value = "门店id", dataType = "Integer", paramType = "query", required = true),
-            @ApiImplicitParam(name = "status", value = "状态", dataType = "Integer", paramType = "query", required = true),
-            @ApiImplicitParam(name = "name", value = "名称", dataType = "Integer", paramType = "query", required = false)
-    })
+    @ApiImplicitParams({@ApiImplicitParam(name = "page", value = "页数", dataType = "Integer", paramType = "query", required = true), @ApiImplicitParam(name = "size", value = "页容", dataType = "Integer", paramType = "query", required = true), @ApiImplicitParam(name = "storeId", value = "门店id", dataType = "Integer", paramType = "query", required = true), @ApiImplicitParam(name = "status", value = "状态", dataType = "Integer", paramType = "query", required = true), @ApiImplicitParam(name = "name", value = "名称", dataType = "Integer", paramType = "query"), @ApiImplicitParam(name = "dataType", value = "数据类型: 0:正式数据, 1:草稿数据", dataType = "Integer", paramType = "query", defaultValue = "0")})
     @GetMapping("/getCouponList")
-    private R<IPage<LifeCoupon>> getCouponList(@RequestParam(value = "page", defaultValue = "1") int page,
-                                               @RequestParam(value = "size", defaultValue = "10") int size,
-                                               @RequestParam("storeId") String storeId,
-                                               @RequestParam("status") String status,
-                                               @RequestParam(value = "name",required = false) String name) {
-        log.info("LifeCouponController.getCouponList?page={},size={},storeId={},status={},name={}", page, size, storeId, status, name);
-        return R.data(lifeCouponService.getCouponList(page, size, storeId, status, name));
+    private R<IPage<LifeCoupon>> getCouponList(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "size", defaultValue = "10") int size, @RequestParam("storeId") String storeId, @RequestParam("status") String status, @RequestParam(value = "name", required = false) String name, @RequestParam(value = "dataType", defaultValue = "0") Integer dataType) {
+        log.info("LifeCouponController.getCouponList?page={},size={},storeId={},status={},name={},dataType={}", page, size, storeId, status, name, dataType);
+        return R.data(lifeCouponService.getCouponList(page, size, storeId, status, name, dataType));
     }
 
     @ApiOperation("暂停恢复优惠券")
@@ -71,8 +79,7 @@ public class LifeCouponController {
     }
 
     @ApiOperation("核销订单")
-    @ApiImplicitParams({@ApiImplicitParam(name = "storeId", value = "门店id", dataType = "Integer", paramType = "query", required = true),
-            @ApiImplicitParam(name = "quanCode", value = "券码", dataType = "Integer", paramType = "query", required = true)})
+    @ApiImplicitParams({@ApiImplicitParam(name = "storeId", value = "门店id", dataType = "Integer", paramType = "query", required = true), @ApiImplicitParam(name = "quanCode", value = "券码", dataType = "Integer", paramType = "query", required = true)})
     @GetMapping("/verify")
     public R<Map<String, String>> verify(@RequestParam("storeId") String storeId, @RequestParam("quanCode") String quanCode) {
         log.info("LifeCouponController.verify?storeId={},quanCode={}", storeId, quanCode);
@@ -82,9 +89,7 @@ public class LifeCouponController {
     @ApiOperation("获取优惠券状态")
     @ApiOperationSupport(order = 1)
     @GetMapping("/getCouponStatus")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "couponId", value = "优惠券id", dataType = "String", paramType = "query", required = true),
-    })
+    @ApiImplicitParams({@ApiImplicitParam(name = "couponId", value = "优惠券id", dataType = "String", paramType = "query", required = true),})
     public R<LifeCouponStatusVo> getCouponStatus(@RequestParam(value = "couponId") String couponId) {
         log.info("LifeDiscountCouponController.getCouponStatus?couponId={}", couponId);
         try {
@@ -97,20 +102,11 @@ public class LifeCouponController {
     }
 
     @ApiOperation("节假日列表")
-    @ApiImplicitParams({@ApiImplicitParam(name = "page", value = "页数", dataType = "Integer", paramType = "query", required = true),
-            @ApiImplicitParam(name = "size", value = "页容", dataType = "Integer", paramType = "query", required = true),
-            @ApiImplicitParam(name = "year", value = "年份", dataType = "String", paramType = "query", required = false),
-            @ApiImplicitParam(name = "openFlag", value = "是否启用(0:未启用,1:已启用)", dataType = "String", paramType = "query", required = false),
-            @ApiImplicitParam(name = "holidayName", value = "节假日名称", dataType = "String", paramType = "query", required = false)
-    })
+    @ApiImplicitParams({@ApiImplicitParam(name = "page", value = "页数", dataType = "Integer", paramType = "query", required = true), @ApiImplicitParam(name = "size", value = "页容", dataType = "Integer", paramType = "query", required = true), @ApiImplicitParam(name = "year", value = "年份", dataType = "String", paramType = "query", required = false), @ApiImplicitParam(name = "openFlag", value = "是否启用(0:未启用,1:已启用)", dataType = "String", paramType = "query", required = false), @ApiImplicitParam(name = "holidayName", value = "节假日名称", dataType = "String", paramType = "query", required = false)})
     @GetMapping("/getHolidayList")
-    private R<IPage<EssentialHolidayComparison>> getHolidayList(@RequestParam(value = "page", defaultValue = "1") int page,
-                                                                @RequestParam(value = "size", defaultValue = "10") int size,
-                                                                @RequestParam("year") String year,
-                                                                @RequestParam("openFlag") String openFlag,
-                                                                @RequestParam("holidayName") String holidayName) {
-        log.info("LifeCouponController.getHolidayList?page={},size={},year={},openFlag={},holidayName={}", page, size, year,openFlag, holidayName);
-        return R.data(lifeCouponService.getHolidayList(page, size, year,openFlag, holidayName));
+    private R<IPage<EssentialHolidayComparison>> getHolidayList(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "size", defaultValue = "10") int size, @RequestParam("year") String year, @RequestParam("openFlag") String openFlag, @RequestParam("holidayName") String holidayName) {
+        log.info("LifeCouponController.getHolidayList?page={},size={},year={},openFlag={},holidayName={}", page, size, year, openFlag, holidayName);
+        return R.data(lifeCouponService.getHolidayList(page, size, year, openFlag, holidayName));
     }
 
     @ApiOperation("保存节假日")

alien-store/src/main/java/shop/alien/store/controller/LifeDiscountCouponController.java

@@ -206,6 +206,7 @@ public class LifeDiscountCouponController {
             @ApiImplicitParam(name = "couponName", value = "优惠券名称", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "tab", value = "分页类型(0:全部(传其他也查全部)，1：进行中，2：已结束)", dataType = "String", paramType = "query", required = true),
             @ApiImplicitParam(name = "couponsFromType", required = false, value = "查询类型(1:我的优惠券，2:好友的优惠券)"),
+            @ApiImplicitParam(name = "couponStatus", required = false, value = "优惠券状态(0:草稿，1:正式)"),
     })
     public R<IPage<LifeDiscountCouponVo>> getStoreAllCouponList(@ApiIgnore @TokenInfo UserLoginInfo userLoginInfo,
                                                                 @RequestParam(defaultValue = "1") int page,

alien-store/src/main/java/shop/alien/store/controller/LifeGroupBuyController.java

@@ -64,9 +64,9 @@ public class LifeGroupBuyController {
 
     @ApiOperation("修改团购状态")
     @GetMapping("/updateStatus")
-    private R updateStatus(@RequestParam("id") String id, @RequestParam("status") String status) {
-        log.info("LifeGroupBuyController.updateStatus?id={},status={}", id, status);
-        if (lifeGroupBuyService.updateStatus(id, status)) {
+    private R updateStatus(@RequestParam("id") String id, @RequestParam("status") String status, @RequestParam("approvalComments") String approvalComments) {
+        log.info("LifeGroupBuyController.updateStatus?id={},status={},approvalComments={}", id, status, approvalComments);
+        if (lifeGroupBuyService.updateStatus(id, status, approvalComments)) {
             return R.success("成功");
         }
         return R.fail("失败");

alien-store/src/main/java/shop/alien/store/controller/LifeUserOrderController.java

@@ -1,8 +1,5 @@
 package shop.alien.store.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
@@ -10,29 +7,16 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.entity.result.BusinessException;
 import shop.alien.entity.result.R;
-import shop.alien.entity.store.LifeCoupon;
-import shop.alien.entity.store.LifeGroupBuyMain;
-import shop.alien.entity.store.LifeUserOrder;
-import shop.alien.entity.store.OrderCouponMiddle;
+import shop.alien.entity.store.LifeRefundOrder;
 import shop.alien.entity.store.dto.LifeUserOrderDto;
 import shop.alien.entity.store.vo.LifeUserOrderVo;
-import shop.alien.mapper.LifeCouponMapper;
-import shop.alien.mapper.LifeGroupBuyMainMapper;
-import shop.alien.mapper.LifeUserOrderMapper;
-import shop.alien.mapper.OrderCouponMiddleMapper;
 import shop.alien.store.service.LifeUserOrderService;
 import shop.alien.util.common.AlipayTradeAppPay;
 import shop.alien.util.common.UniqueRandomNumGenerator;
-import shop.alien.util.common.constant.OrderStatusEnum;
 
-import java.time.LocalDateTime;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @Api(tags = {"2.5期-订单"})
 @Slf4j
@@ -43,13 +27,9 @@ import java.util.stream.Collectors;
 public class LifeUserOrderController {
 
     private final LifeUserOrderService lifeUserOrderService;
-    private final LifeUserOrderMapper lifeUserOrderMapper;
-    private final OrderCouponMiddleMapper orderCouponMiddleMapper;
-    private final LifeCouponMapper lifeCouponMapper;
-    private final LifeGroupBuyMainMapper lifeGroupBuyMainMapper;
 
     @ApiOperation("获取支付信息")
-    @ApiOperationSupport(order = 4)
+    @ApiOperationSupport(order = 1)
     @ApiImplicitParams({@ApiImplicitParam(name = "payPrice", value = "payPrice", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "quanName", value = "quanName", dataType = "String", paramType = "query")})
     @GetMapping("/getOrderStrForPay")
@@ -70,7 +50,7 @@ public class LifeUserOrderController {
 
 
     @ApiOperation("创建订单")
-    @ApiOperationSupport(order = 1)
+    @ApiOperationSupport(order = 2)
     @PostMapping("/createUserOrder")
     public R<Map<String, Object>> createUserOrder(@RequestBody LifeUserOrderDto LifeUserOrderDto) {
         log.info("userOrder.createUserOrder:{}", LifeUserOrderDto);
@@ -78,7 +58,7 @@ public class LifeUserOrderController {
     }
 
     @ApiOperation("更新订单")
-    @ApiOperationSupport(order = 2)
+    @ApiOperationSupport(order = 3)
     @PostMapping("/updateUserOrder")
     public R<Map<String, Object>> updateUserOrder(@RequestBody LifeUserOrderDto LifeUserOrderDto) {
         log.info("userOrder.updateUserOrder:{}", LifeUserOrderDto);
@@ -91,7 +71,7 @@ public class LifeUserOrderController {
 
 
     @ApiOperation("删除订单")
-    @ApiOperationSupport(order = 3)
+    @ApiOperationSupport(order = 4)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
     })
@@ -111,7 +91,7 @@ public class LifeUserOrderController {
             @ApiImplicitParam(name = "size", value = "每页数量", required = true),
             @ApiImplicitParam(name = "userId", value = "用户id", required = false),
             @ApiImplicitParam(name = "storeId", value = "商户id", required = false),
-            @ApiImplicitParam(name = "couponType", value = "订单类型,-1,全部（可以不传）,0,代金券；1，团购；", required = false),
+            @ApiImplicitParam(name = "couponType", value = "订单类型,-1,全部（可以不传）,1,代金券；2，团购；", required = false),
             @ApiImplicitParam(name = "orderStatus", value = "订单状态,-1，全部（可以不传）；0，待支付;1，已支付/待使用;2，已核销；3，已过期;4，已取消;5.已退款，全退款了才算", required = false),
             @ApiImplicitParam(name = "name", value = "订单名称", required = false)
     })
@@ -145,66 +125,38 @@ public class LifeUserOrderController {
         return lifeUserOrderService.queryUserOrderDetail(orderId, longitude, latitude);
     }
 
+    @ApiOperation("提交支付团购套餐和代金券前检查")
+    @ApiOperationSupport(order = 7)
+    @ApiImplicitParams({@ApiImplicitParam(name = "couponId", value = "优惠券id", dataType = "String", paramType = "query", required = true),
+            @ApiImplicitParam(name = "couponType", value = "优惠券类型，1代金券；2团购券", dataType = "int", paramType = "query", required = true),
+            @ApiImplicitParam(name = "userId", value = "用户id", dataType = "String", paramType = "query", required = true),
+            @ApiImplicitParam(name = "storeId", value = "商户id", dataType = "String", paramType = "query", required = true),
+            @ApiImplicitParam(name = "count", value = "数量", dataType = "int", paramType = "query", required = true)})
+    @GetMapping("/buyCouponCheck")
+    public R<Map<String, Object>> buyCouponCheck(@RequestParam("couponId") String couponId,
+                                               @RequestParam("couponType") Integer couponType,
+                                               @RequestParam("userId") String userId,
+                                               @RequestParam("storeId") String storeId,
+                                               @RequestParam("count") int count) {
+        log.info("userOrder.buyCouponCheck:couponId={}&couponType={}&userId={}&storeId={}&count={}", couponId, couponType, userId, storeId, count);
+        return R.data(lifeUserOrderService.buyCouponCheck(couponId, couponType, userId, storeId, count));
+    }
 
-    @GetMapping("/test")
-    public String get() {
-        //1.查询待支付超时订单
-        List<LifeUserOrder> lifeUserOrders = lifeUserOrderMapper.selectList(new LambdaQueryWrapper<LifeUserOrder>()
-                .eq(LifeUserOrder::getStatus, OrderStatusEnum.WAIT_PAY.getStatus())
-                .le(LifeUserOrder::getBuyTime, LocalDateTime.now().minusMinutes(15)));
-        if( CollectionUtils.isEmpty(lifeUserOrders) ){
-            return "无待支付超时订单";
-        }
-        //2.超时则取消订单id
-        List<String> orderIds = lifeUserOrders.stream().map(LifeUserOrder::getId).collect(Collectors.toList());
-        lifeUserOrderMapper.update(null,new LambdaUpdateWrapper<LifeUserOrder>()
-                .set(LifeUserOrder::getStatus,OrderStatusEnum.CANCEL.getStatus())
-                .set(LifeUserOrder::getCancelTime,LocalDateTime.now())
-                .set(LifeUserOrder::getCancelReason,"订单超时未支付")
-                .in(LifeUserOrder::getId,orderIds));
-        // 根据类型分组
-        Map<Integer, List<String>> collect = lifeUserOrders.stream()
-                .collect(Collectors.groupingBy(
-                        LifeUserOrder::getCouponType,  // 按订单类型分组
-                        Collectors.mapping(  // 对每个分组中的元素提取ID
-                                LifeUserOrder::getId,
-                                Collectors.toList()
-                        )
-                ));
-        int updateNum = 0;
-        if(collect.containsKey(0)){
-            //3.1代金券订单
-            List<String> couponOrderIds = collect.get(0);
-            QueryWrapper<OrderCouponMiddle> queryWrapper = new QueryWrapper<OrderCouponMiddle>().in("order_id", couponOrderIds)
-                    .eq("status", 0)
-                    .groupBy("coupon_id")  // 按coupon_id分组
-                    .select("coupon_id, COUNT(*) as count");  // 选择分组字段和统计数量
-            List<OrderCouponMiddle> orderCouponMiddles = orderCouponMiddleMapper.selectList(queryWrapper);
-            for (OrderCouponMiddle orderCouponMiddle : orderCouponMiddles) {
-                // 恢复库存
-                updateNum += lifeCouponMapper.update(null, new LambdaUpdateWrapper<LifeCoupon>()
-                        .setSql("stock_qty=stock_qty+" + orderCouponMiddle.getCount())
-                        .eq(LifeCoupon::getId, orderCouponMiddle.getCouponId()));
-            }
-        }
-        if(collect.containsKey("1")){
-            //3.2团购订单
-            List<String> groupOrderIds = collect.get(1);
-            QueryWrapper<OrderCouponMiddle> queryWrapper = new QueryWrapper<OrderCouponMiddle>().in("order_id", groupOrderIds)
-                    .eq("status", 0)
-                    .groupBy("coupon_id")  // 按coupon_id分组
-                    .select("coupon_id, COUNT(*) as count");
-            List<OrderCouponMiddle> orderCouponMiddles = orderCouponMiddleMapper.selectList(queryWrapper);
-            for (OrderCouponMiddle orderCouponMiddle : orderCouponMiddles) {
-                // 恢复库存
-                updateNum += lifeGroupBuyMainMapper.update(null,new LambdaUpdateWrapper<LifeGroupBuyMain>()
-                        .setSql("stock_qty=stock_qty+" + orderCouponMiddle.getCount())
-                        .eq(LifeGroupBuyMain::getId, orderCouponMiddle.getCouponId()));
-            }
-        }
-        if(updateNum!=lifeUserOrders.size()){
-            throw new BusinessException("恢复团购库存失败");
-        }
-        return "success";
+    @ApiOperation("订单是否可以退款")
+    @ApiOperationSupport(order = 4)
+    @PostMapping("/refundCfheck")
+    @Deprecated
+    public R<Map<String, Object>> refundCheck(LifeRefundOrder refundOrder) {
+        log.info("UserOrderController.refundCheck?refundOrder={}", refundOrder.toString());
+        return R.data(lifeUserOrderService.refundCheck(refundOrder));
+    }
+
+    @ApiOperation("订单退款")
+    @ApiOperationSupport(order = 5)
+    @PostMapping("/requestRefund")
+    @Deprecated
+    public R<Map<String, Object>> requestRefund(LifeRefundOrder refundOrder) {
+        log.info("UserOrderController.requestRefund?refundOrder={}", refundOrder.toString());
+        return R.data(lifeUserOrderService.requestRefund(refundOrder));
     }
 }

alien-store/src/main/java/shop/alien/store/controller/ManagementInfoController.java

@@ -52,14 +52,20 @@ public class ManagementInfoController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "storeId", value = "店铺id", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "page", value = "分页序数", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "size", value = "分页长度", dataType = "String", paramType = "query")
+            @ApiImplicitParam(name = "size", value = "分页长度", dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "orderNo", value = "订单号", dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "userId", value = "用户ID", dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "userName", value = "用户名", dataType = "String", paramType = "query")
     })
     @GetMapping("/getStoreOrderDetail")
     public R<IPage<ManagementInfoVo>> getStoreOrderDetail(
             @RequestParam(value = "page", defaultValue = "1") int page,
             @RequestParam(value = "size", defaultValue = "10") int size,
-            @RequestParam(value = "storeId", required = false) String storeId) {
-        return R.data(managementInfoService.getStoreOrderDetail(page, size, storeId));
+            @RequestParam(value = "storeId", required = false) String storeId,
+            @RequestParam(value = "orderNo", required = false) String orderNo,
+            @RequestParam(value = "userId", required = false) String userId,
+            @RequestParam(value = "userName", required = false) String userName) {
+        return R.data(managementInfoService.getStoreOrderDetail(page, size, storeId, orderNo, userId, userName));
     }
 
     @ApiOperation("店铺详情账单统计")

alien-store/src/main/java/shop/alien/store/controller/PlatformStoreCouponController.java

@@ -6,8 +6,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
-import shop.alien.entity.store.LifeCoupon;
-import shop.alien.entity.store.LifeGroupBuyMain;
 import shop.alien.entity.store.vo.LifeCouponVo;
 import shop.alien.entity.store.vo.LifeGroupBuyMainVo;
 import shop.alien.store.service.PlatformStoreCouponService;
@@ -135,7 +133,7 @@ public class PlatformStoreCouponController {
     @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "主键id", dataType = "Integer", paramType = "query", required = true),
             @ApiImplicitParam(name = "status", value = "状态", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "comment", value = "审批意见", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "type", value = "代金券/套餐类型 0:代金券 1:套餐", dataType = "String", paramType = "query")})
+            @ApiImplicitParam(name = "type", value = "代金券/套餐类型 1:代金券 2:套餐", dataType = "String", paramType = "query")})
     @GetMapping("/approvalCoupon")
     public R<Integer> approvalCoupon(Integer id, Integer status, String comment, String type) {
         log.info("PlatformStoreCouponController.approvalCoupon?id={},status={},comment={}type={}", id, status, comment, type);

alien-store/src/main/java/shop/alien/store/controller/StoreIncomeDetailsRecordController.java

@@ -63,10 +63,13 @@ public class StoreIncomeDetailsRecordController {
     @GetMapping("/approveCashOut")
     public R<Boolean> approveCashOut(Integer cashOutId, String approveStatus, String failReason) {
         String s = storeIncomeDetailsRecordService.approveCashOut(cashOutId, approveStatus, failReason);
-        if ("success".equals(s)) {
-            return R.success("提现成功");
+        if ("付款失败".equals(s)) {
+            return R.fail("付款失败");
+        } else if("付款状态异常".equals(s)){
+            return R.fail("付款状态异常");
+        } else {
+            return R.success(s);
         }
-        return R.fail(s);
     }
 
     @ApiOperation("新增收入-手续费一单一算")
@@ -127,4 +130,12 @@ public class StoreIncomeDetailsRecordController {
         return R.data(storeIncomeDetailsRecordService.groupIncome(storeId, date, incomeType,page,size));
     }
 
+
+    @ApiOperation("今日订单数")
+    @ApiOperationSupport(order = 7)
+    @ApiImplicitParams({@ApiImplicitParam(name = "storeId", value = "门店id", dataType = "Integer", paramType = "query", required = true)})
+    @GetMapping("/todayOrderCount")
+    public R<Integer> todayOrderCount(Integer storeId) {
+        return R.data(storeIncomeDetailsRecordService.todayOrderCount(storeId));
+    }
 }

alien-store/src/main/java/shop/alien/store/controller/UserOrderController.java

@@ -79,6 +79,7 @@ public class UserOrderController {
     @ApiOperation("订单是否可以退款")
     @ApiOperationSupport(order = 4)
     @PostMapping("/refundCfheck")
+    @Deprecated
     public R<Map<String, Object>> refundCheck(LifeRefundOrder refundOrder) {
         log.info("UserOrderController.refundCheck?refundOrder={}", refundOrder.toString());
         return R.data(userOrderService.refundCheck(refundOrder));
@@ -87,6 +88,7 @@ public class UserOrderController {
     @ApiOperation("订单退款")
     @ApiOperationSupport(order = 5)
     @PostMapping("/requestRefund")
+    @Deprecated
     public R<Map<String, Object>> requestRefund(LifeRefundOrder refundOrder) {
         log.info("UserOrderController.requestRefund?refundOrder={}", refundOrder.toString());
         return R.data(userOrderService.requestRefund(refundOrder));

alien-store/src/main/java/shop/alien/store/controller/UserStoreController.java

@@ -69,6 +69,7 @@ public class UserStoreController {
             @ApiImplicitParam(name = "cnt", value = "cnt", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "payPrice", value = "payPrice", dataType = "String", paramType = "query")})
     @GetMapping("/buyQuanCheck")
+    @Deprecated
     public R<Map<String, Object>> buyQuanCheck(@RequestParam("quanId") String quanId,
                                                @RequestParam("userId") String userId,
                                                @RequestParam("cnt") int cnt,

alien-store/src/main/java/shop/alien/store/controller/WebSocketController.java

@@ -12,6 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import shop.alien.entity.result.R;
 import shop.alien.store.config.WebSocketProcess;
+import shop.alien.util.common.JwtUtil;
+
+import java.util.Objects;
 
 /**
  * websocket消息推送
@@ -30,6 +33,29 @@ public class WebSocketController {
 
     private final WebSocketProcess webSocketProcess;
 
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("向指定客户端发消息")
+    @GetMapping(value = "/sendMsgToClientByPhoneId")
+    public R<Boolean> sendMsgToClientByPhoneId(String messageReceiverId, String webSocketVoStr) {
+        try {
+            log.info("WebSocketController.sendMsgToClientByPhoneId?messageReceiverId={}, webSocketVoStr={}", messageReceiverId, webSocketVoStr);
+            webSocketProcess.sendMessage(messageReceiverId, webSocketVoStr);
+            return R.success("发送成功");
+        } catch (Exception e) {
+            log.error("WebSocketController_sendMsgToClientById Error Mgs={}", e.getMessage());
+        }
+        return R.fail("发送失败");
+    }
+
+    @ApiOperationSupport(order = 2)
+    @ApiOperation("socket轮询获取token状态")
+    @GetMapping(value = "/getTokenStatus")
+    public R<Boolean> getTokenStatus() {
+        String phoneId = Objects.requireNonNull(JwtUtil.getCurrentUserInfo()).getString("userType") + "_" + JwtUtil.getCurrentUserInfo().getString("phone");
+        log.info("WebSocketController.getTokenStatus()----------phoneId={}", phoneId);
+        return R.data(true);
+    }
+
 //    @ApiOperationSupport(order = 1)
 //    @ApiOperation("向指定客户端发消息")
 //    @GetMapping(value = "/sendMsgToClientByPhoneId")
@@ -59,19 +85,6 @@ public class WebSocketController {
 //        return R.fail("发送失败");
 //    }
 
-    @ApiOperationSupport(order = 1)
-    @ApiOperation("向指定客户端发消息")
-    @GetMapping(value = "/sendMsgToClientByPhoneId")
-    public R<Boolean> sendMsgToClientByPhoneId(String messageReceiverId, String webSocketVoStr) {
-        try {
-            log.info("WebSocketController.sendMsgToClientByPhoneId?messageReceiverId={}, webSocketVoStr={}", messageReceiverId, webSocketVoStr);
-            webSocketProcess.sendMessage(messageReceiverId, webSocketVoStr);
-            return R.success("发送成功");
-        } catch (Exception e) {
-            log.error("WebSocketController_sendMsgToClientById Error Mgs={}", e.getMessage());
-        }
-        return R.fail("发送失败");
-    }
 
 //    /**
 //     * 向指定客户端发消息

alien-store/src/main/java/shop/alien/store/service/LifeBlacklistService.java

@@ -24,4 +24,6 @@ public interface LifeBlacklistService extends IService<LifeBlacklist> {
     Boolean isBlackListUser(LifeBlacklist lifeBlacklist);
 
     int cancelBlacklist(LifeBlacklist lifeBlacklist);
+
+    boolean hasBlackList(String otherSidePhoneId) throws Exception;
 }

alien-store/src/main/java/shop/alien/store/service/LifeCouponService.java

@@ -2,6 +2,7 @@ package shop.alien.store.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.bind.annotation.RequestParam;
 import shop.alien.entity.store.EssentialHolidayComparison;
 import shop.alien.entity.store.LifeCoupon;
 import shop.alien.entity.store.vo.LifeCouponStatusVo;
@@ -15,18 +16,27 @@ public interface LifeCouponService extends IService<LifeCoupon> {
 
     boolean addOrUpdateCoupon(LifeCoupon lifeCoupon);
 
-    IPage<LifeCoupon> getCouponList(int page, int size, String storeId, String status, String name);
+    /**
+     * 修改库存数量
+     *
+     * @param id        主键
+     * @param singleQty 库存数量
+     * @return boolean
+     */
+    boolean updateCouponSingleQty(Integer id, Integer singleQty);
+
+    IPage<LifeCoupon> getCouponList(int page, int size, String storeId, String status, String name, Integer dataType);
 
     int updateCoupon(String id, Integer status);
 
-    Map<String,String> couponVerify(String storeId, String quanCode);
+    Map<String, String> couponVerify(String storeId, String quanCode);
 
     /**
      * 获取代金券状态
      */
     public LifeCouponStatusVo getCouponStatus(String couponId);
 
-    IPage<EssentialHolidayComparison> getHolidayList(int page, int size, String year,String openFlag, String holidayName);
+    IPage<EssentialHolidayComparison> getHolidayList(int page, int size, String year, String openFlag, String holidayName);
 
     boolean saveHoliday(EssentialHolidayComparison essentialHolidayComparison);
 

alien-store/src/main/java/shop/alien/store/service/LifeGroupBuyService.java

@@ -19,7 +19,7 @@ public interface LifeGroupBuyService extends IService<LifeGroupBuyMain> {
 
     LifeGroupBuyThaliVo getThaliById(String id);
 
-    boolean updateStatus(String id,String status);
+    boolean updateStatus(String id,String status, String approvalComments);
 
     boolean delThaliById(String id,String groupType);
 

alien-store/src/main/java/shop/alien/store/service/LifeUserOrderService.java

@@ -26,7 +26,10 @@ import shop.alien.store.config.GaoDeMapUtil;
 import shop.alien.util.ali.AliOSSUtil;
 import shop.alien.util.common.AlipayTradeRefund;
 import shop.alien.util.common.UniqueRandomNumGenerator;
+import shop.alien.util.common.constant.CouponStatusEnum;
+import shop.alien.util.common.constant.CouponTypeEnum;
 import shop.alien.util.common.constant.DiscountCouponEnum;
+import shop.alien.util.common.constant.OrderStatusEnum;
 
 import java.io.File;
 import java.io.IOException;
@@ -448,7 +451,7 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
     public Map<String, Object> refundCheck(LifeRefundOrder refundOrder) {
         Map<String, Object> returnMap = new HashMap<>();
         LifeUserOrder order = lifeUserOrderMapper.selectById(refundOrder.getOrderId());
-        if (order.getStatus() != 0) {
+        if (order.getStatus() != 1) {
             returnMap.put("success", "不可退款");
             returnMap.put("reason", "当前订单状态不是待消费");
             return returnMap;
@@ -588,7 +591,7 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
         // 订单金额
         lifeUserOrder.setFinalPrice(lifeUserOrderDto.getFinalPrice());
         // 订单类型
-        lifeUserOrder.setCouponType(null == lifeUserOrderDto.getCouponType() ? 0 : lifeUserOrderDto.getCouponType());
+        lifeUserOrder.setCouponType(null == lifeUserOrderDto.getCouponType() ? 1 : lifeUserOrderDto.getCouponType());
         // 订单状态
         lifeUserOrder.setStatus(null == lifeUserOrderDto.getStatus() ? 0 : lifeUserOrderDto.getStatus());
         // 购买时间
@@ -630,9 +633,9 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
             // 退款时间
             // 删除标记
         }
-        //4. 代金券/团购库存扣除 coupon_type 0 代金券 1团购
+        //4. 代金券/团购库存扣除 coupon_type 1 代金券 2团购
         int successful = 0;
-        if(lifeUserOrderDto.getCouponType() == 1){
+        if(lifeUserOrderDto.getCouponType() == 2){
             // 团购库存扣除
             successful = lifeGroupBuyMainMapper.update(null, new UpdateWrapper<LifeGroupBuyMain>()
                     .eq("id", lifeUserOrderDto.getCouponId()).setSql("inventory_num = inventory_num - " + lifeUserOrderDto.getCount()));
@@ -739,7 +742,7 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
         lifeUserOrderQueryWrapper.gt(org.apache.commons.lang3.StringUtils.isNotBlank(startTime),"luo.created_time",startTime + " 00:00:00");
         lifeUserOrderQueryWrapper.lt(org.apache.commons.lang3.StringUtils.isNotBlank(endTime),"luo.created_time",endTime + " 23:59:59");
         lifeUserOrderQueryWrapper.orderByDesc("luo.created_time");
-        lifeUserOrderQueryWrapper.groupBy("tc.coupon_type","tc.coupon_id");
+        lifeUserOrderQueryWrapper.groupBy("luo.coupon_type","luo.id");
         IPage<LifeUserOrderVo> lifeUserOrderVoIPage = lifeUserOrderMapper.queryUserOrderList(brandedPage, lifeUserOrderQueryWrapper);
         if (!"-1".equals(orderStatus)) {
             lifeUserOrderVoIPage.getRecords().forEach(x->x.setStatus(Integer.parseInt(orderStatus)));
@@ -865,4 +868,97 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
         lifeUserOrderVo.setCouponCount(lifeUserOrderVo.getOrderCouponMiddleList().size());
         return R.data(lifeUserOrderVo);
     }
+    /**
+     * 团购/代金券-校验用户是否可以购买
+     * @param couponId 团购/代金券id
+     * @param couponType 团购/代金券类型
+     * @param userId 用户id
+     * @param count 购买数量
+     * @return
+     */
+    public Map<String, Object> buyCouponCheck(String couponId, Integer couponType, String userId,String storeId, Integer count) {
+        Map<String, Object> returnMap = new HashMap<>();
+        // 获取团购/代金券信息
+        Integer status = 0;
+        // 限购数量， 已购数量
+        Integer buyLimit = 0;
+        Integer buyCount = 0;
+        // 库存
+        Integer stockQty = 0;
+        // 结束时间
+        Date endTime = null;
+        if (couponType == CouponTypeEnum.GROUP_BUY.getCode()) {
+            // 团购
+            LifeGroupBuyMain lifeGroupBuyMain = lifeGroupBuyMainMapper.selectById(couponId);
+            status = lifeGroupBuyMain.getStatus();
+            // 限购类型
+            Integer quotaType = lifeGroupBuyMain.getQuotaType();
+            if (0 != quotaType) {
+                // 限购数量
+                buyLimit = Integer.parseInt(lifeGroupBuyMain.getQuotaValue());
+                // 已购数量
+                buyCount = orderCouponMiddleMapper.selectCount(new QueryWrapper<OrderCouponMiddle>().eq("coupon_id", couponId).notIn("status", OrderStatusEnum.CANCEL.getStatus(), OrderStatusEnum.REFUND.getStatus())
+                        .inSql("order_id", "select order_id from life_user_order where user_id = " + userId + " and store_id = " + storeId));
+            }
+            // 库存 inventory_num
+            stockQty = lifeGroupBuyMain.getInventoryNum();
+            endTime = lifeGroupBuyMain.getEndTime();
+        } else if (1 == CouponTypeEnum.COUPON.getCode()) {
+            // 代金券
+            LifeCoupon lifeCoupon = lifeCouponMapper.selectById(couponId);
+            status = lifeCoupon.getStatus();
+            // 限购数量
+            buyLimit = lifeCoupon.getBuyLimit();
+            // 已购数量
+            buyCount = orderCouponMiddleMapper.selectCount(new QueryWrapper<OrderCouponMiddle>().eq("coupon_id", couponId).notIn("status", OrderStatusEnum.CANCEL.getStatus(), OrderStatusEnum.REFUND.getStatus())
+                    .inSql("order_id", "select order_id from life_user_order where user_id = " + userId + " and store_id = " + storeId));
+            stockQty = lifeCoupon.getStockQty();
+            endTime = lifeCoupon.getEndDate();
+        } else {
+            log.error("buyCouponCheck-团购/代金券类型错误");
+            returnMap.put("success", false);
+            returnMap.put("reason", "团购/代金券类型错误");
+            return returnMap;
+        }
+        // 状态(0草稿/1待审核/2未开始/3审核拒绝/4已售罄/5进行中/6已下架/7已结束/8=2+手动下架)
+        if (status != CouponStatusEnum.ONGOING.getCode()) {
+            returnMap.put("success", false);
+            returnMap.put("reason", "团购/代金券未开始");
+            return returnMap;
+        }
+        // 限购
+        if (0 != buyLimit) {
+            if (buyCount + count > buyLimit) {
+                returnMap.put("success", false);
+                returnMap.put("reason", "购买数量大于限购数量");
+                return returnMap;
+            }
+        }
+        // 库存
+        if (count > stockQty) {
+            returnMap.put("success", false);
+            returnMap.put("reason", "购买数量大于库存数量");
+            return returnMap;
+        }
+        // 时间
+        Date now = new Date();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(now);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        Date nowDay = calendar.getTime();
+        if (nowDay.compareTo(endTime) > 0) {
+            if (couponType == CouponTypeEnum.GROUP_BUY.getCode()) {
+                lifeGroupBuyMainMapper.update(null, new UpdateWrapper<LifeGroupBuyMain>().set("status", CouponStatusEnum.ENDED.getCode()).eq("id", couponId));
+            } else {
+                lifeCouponMapper.update(null, new UpdateWrapper<LifeCoupon>().set("status", CouponStatusEnum.ENDED.getCode()).eq("id", couponId));
+            }
+            returnMap.put("success", false);
+            returnMap.put("reason", "活动已结束");
+            return returnMap;
+        }
+        return returnMap;
+    }
 }

alien-store/src/main/java/shop/alien/store/service/ManagementInfoService.java

@@ -22,7 +22,7 @@ public interface ManagementInfoService {
     /**
      * 获取店铺订单详情，根据id
      */
-    IPage<ManagementInfoVo> getStoreOrderDetail(int pageNo, int pageSize, String storeId);
+    IPage<ManagementInfoVo> getStoreOrderDetail(int pageNo, int pageSize, String storeId, String orderNo, String userId, String userName);
 
     /**
      * 获取提现申请列表

alien-store/src/main/java/shop/alien/store/service/StoreIncomeDetailsRecordService.java

@@ -78,4 +78,11 @@ public interface StoreIncomeDetailsRecordService extends IService<StoreIncomeDet
      */
     StoreIncomeDetailsRecordVo groupIncome(Integer storeId, String date, Integer incomeType, Integer page, Integer size);
 
+    /**
+     * 今日订单数
+     *
+     * @param storeId 门店id
+     * @return 今日订单数
+     */
+    Integer todayOrderCount(Integer storeId);
 }

alien-store/src/main/java/shop/alien/store/service/impl/LifeBlacklistServiceImpl.java

@@ -1,8 +1,10 @@
 package shop.alien.store.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import shop.alien.entity.store.LifeBlacklist;
@@ -16,10 +18,12 @@ import shop.alien.mapper.StoreImgMapper;
 import shop.alien.mapper.StoreUserMapper;
 import shop.alien.store.config.BaseRedisService;
 import shop.alien.store.service.LifeBlacklistService;
+import shop.alien.util.common.JwtUtil;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -30,6 +34,7 @@ import java.util.List;
  * @author ssk
  * @since 2025-04-30
  */
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class LifeBlacklistServiceImpl extends ServiceImpl<LifeBlacklistMapper, LifeBlacklist> implements LifeBlacklistService {
@@ -151,5 +156,19 @@ public class LifeBlacklistServiceImpl extends ServiceImpl<LifeBlacklistMapper, L
         return lifeBlacklistMapper.deleteById(black.getId());
     }
 
+    @Override
+    public boolean hasBlackList(String otherSidePhoneId) throws Exception {
+        try {
+            String phoneId = Objects.requireNonNull(JwtUtil.getCurrentUserInfo()).getString("userType") + "_" + JwtUtil.getCurrentUserInfo().getString("phone");
+            LambdaQueryWrapper<LifeBlacklist> wrapper = new LambdaQueryWrapper<>();
+            wrapper.apply("((blocker_phone_id='" + otherSidePhoneId + "' and blocked_phone_id='" + phoneId + "')" +
+                    " or (blocker_phone_id='" + phoneId + "' and blocked_phone_id='" + otherSidePhoneId + "'))");
+            return lifeBlacklistMapper.selectCount(wrapper) > 0;
+        } catch (Exception e) {
+            log.error("LifeBlacklistServiceImpl.hasBlackList() error={}", e.getMessage());
+            throw new Exception(e);
+        }
+    }
+
 
 }

alien-store/src/main/java/shop/alien/store/service/impl/LifeCouponServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
-import org.apache.http.client.utils.DateUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -97,13 +96,29 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
         }
     }
 
+    /**
+     * 修改库存数量
+     *
+     * @param id        主键
+     * @param singleQty 库存数量
+     * @return boolean
+     */
     @Override
-    public IPage<LifeCoupon> getCouponList(int page, int size, String storeId, String status, String name) {
+    public boolean updateCouponSingleQty(Integer id, Integer singleQty) {
+        LifeCoupon lifeCoupon = new LifeCoupon();
+        lifeCoupon.setId(String.valueOf(id));
+        lifeCoupon.setSingleQty(singleQty);
+        return this.updateById(lifeCoupon);
+    }
+
+    @Override
+    public IPage<LifeCoupon> getCouponList(int page, int size, String storeId, String status, String name, Integer dataType) {
         LambdaUpdateWrapper<LifeCoupon> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(storeId != null && !storeId.isEmpty(), LifeCoupon::getStoreId, storeId);
         wrapper.eq(status != null && !status.isEmpty(), LifeCoupon::getStatus, status);
         wrapper.like(name != null && !name.isEmpty(), LifeCoupon::getName, name);
         wrapper.eq(LifeCoupon::getType, 1);
+        wrapper.eq(LifeCoupon::getDataType, dataType);
         wrapper.orderByDesc(LifeCoupon::getCreatedTime);
         IPage<LifeCoupon> lifeCouponIPage = new Page<>(page, size);
         return lifeCouponMapper.selectPage(lifeCouponIPage, wrapper);
@@ -233,18 +248,18 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
     }
 
     @Override
-    public IPage<EssentialHolidayComparison> getHolidayList(int page, int size, String year,String openFlag,String holidayName) {
+    public IPage<EssentialHolidayComparison> getHolidayList(int page, int size, String year, String openFlag, String holidayName) {
         if (StringUtils.isEmpty(year)) {
             LambdaQueryWrapper<EssentialHolidayComparison> essentialHolidayComparisonLambdaQueryWrapper = new LambdaQueryWrapper<>();
             essentialHolidayComparisonLambdaQueryWrapper.eq(EssentialHolidayComparison::getDelFlag, 0).groupBy(EssentialHolidayComparison::getParticularYear).orderByDesc(EssentialHolidayComparison::getParticularYear);
             IPage<EssentialHolidayComparison> essentialHolidayComparisonIPage = new Page<>(page, size);
             return essentialHolidayComparisonMapper.selectPage(essentialHolidayComparisonIPage, essentialHolidayComparisonLambdaQueryWrapper);
-        }else {
+        } else {
             LambdaQueryWrapper<EssentialHolidayComparison> essentialHolidayComparisonLambdaQueryWrapper = new LambdaQueryWrapper<>();
             essentialHolidayComparisonLambdaQueryWrapper.eq(EssentialHolidayComparison::getDelFlag, 0)
-                    .eq(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(year),EssentialHolidayComparison::getParticularYear,year)
-                    .eq(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(openFlag),EssentialHolidayComparison::getOpenFlag,openFlag)
-                    .like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(holidayName),EssentialHolidayComparison::getFestivalName,holidayName)
+                    .eq(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(year), EssentialHolidayComparison::getParticularYear, year)
+                    .eq(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(openFlag), EssentialHolidayComparison::getOpenFlag, openFlag)
+                    .like(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotEmpty(holidayName), EssentialHolidayComparison::getFestivalName, holidayName)
                     .orderByAsc(EssentialHolidayComparison::getStartTime);
             IPage<EssentialHolidayComparison> essentialHolidayComparisonIPage = new Page<>(page, size);
             return essentialHolidayComparisonMapper.selectPage(essentialHolidayComparisonIPage, essentialHolidayComparisonLambdaQueryWrapper);
@@ -259,7 +274,7 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
             }
             essentialHolidayComparisonMapper.updateById(essentialHolidayComparison);
             return true;
-        }else {
+        } else {
             if (ObjectUtils.isNotEmpty(essentialHolidayComparison.getStartTime())) {
                 essentialHolidayComparison.setFestivalDate(essentialHolidayComparison.getStartTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
             }

alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponServiceImpl.java

@@ -786,6 +786,14 @@ public class LifeDiscountCouponServiceImpl extends ServiceImpl<LifeDiscountCoupo
                     } else if (startResult >= 0 && endResult <= 0) {
                         lifeDiscountCouponVo.setStatus(Integer.parseInt(DiscountCouponEnum.UNDER_WAY.getValue()));
                     }
+                } else {
+                    if(lifeDiscountCoupon.getCouponStatus() == 0){
+                        //如果为草稿则状态为未开始
+                        lifeDiscountCouponVo.setStatus(Integer.parseInt(DiscountCouponEnum.HAVE_NOT_STARTED.getValue()));
+                    } else {
+                        // 开始结束时间为空，数据异常跳过
+                        continue;
+                    }
                 }
                 // 查询三个规则
                 List<LifeDiscountCouponUnavailableRules> discountCouponId = lifeDiscountCouponUnavailableRulesMapper.selectList(new QueryWrapper<LifeDiscountCouponUnavailableRules>().eq("discount_coupon_id", lifeDiscountCoupon.getId()));
@@ -855,9 +863,17 @@ public class LifeDiscountCouponServiceImpl extends ServiceImpl<LifeDiscountCoupo
                         record.setStatus(Integer.parseInt(DiscountCouponEnum.HAVE_NOT_STARTED.getValue()));
                     } else if (endResult > 0) {
                         record.setStatus(Integer.parseInt(DiscountCouponEnum.FINISHED.getValue()));
-                    } else if (startResult >= 0 && endResult <= 0) {
+                    } else {
                         record.setStatus(Integer.parseInt(DiscountCouponEnum.UNDER_WAY.getValue()));
                     }
+                } else {
+                    if(record.getCouponStatus() == 0){
+                        //如果为草稿则状态为未开始
+                        record.setStatus(Integer.parseInt(DiscountCouponEnum.HAVE_NOT_STARTED.getValue()));
+                    } else {
+                        // 开始结束时间为空，数据异常跳过
+                        continue;
+                    }
                 }
                 List<LifeDiscountCouponUnavailableRules> discountCouponId = lifeDiscountCouponUnavailableRulesMapper.selectList(new QueryWrapper<LifeDiscountCouponUnavailableRules>().eq("discount_coupon_id", record.getCouponId()));
                 Map<String, List<LifeDiscountCouponUnavailableRules>> collect = discountCouponId.stream().collect(Collectors.groupingBy(x -> x.getUnavailableRuleType()));

alien-store/src/main/java/shop/alien/store/service/impl/LifeGroupBuyServiceImpl.java

@@ -135,8 +135,8 @@ public class LifeGroupBuyServiceImpl extends ServiceImpl<LifeGroupBuyMainMapper,
     }
 
     @Override
-    public boolean updateStatus(String id, String status) {
-        lifeGroupBuyMainMapper.update(null, new LambdaUpdateWrapper<LifeGroupBuyMain>().eq(LifeGroupBuyMain::getId, id).set(LifeGroupBuyMain::getStatus, status));
+    public boolean updateStatus(String id, String status, String approvalComments) {
+        lifeGroupBuyMainMapper.update(null, new LambdaUpdateWrapper<LifeGroupBuyMain>().eq(LifeGroupBuyMain::getId, id).set(LifeGroupBuyMain::getStatus, status).set(LifeGroupBuyMain::getApprovalComments, approvalComments));
         return true;
     }
 

alien-store/src/main/java/shop/alien/store/service/impl/LifeMessageServiceImpl.java

@@ -434,6 +434,7 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
             messageWrapper.eq(LifeMessage::getReceiverId, receiverId);
             messageWrapper.eq(LifeMessage::getIsRead, 0);
             messageWrapper.notIn(LifeMessage::getSenderId, notDisturbIdsStr);
+            messageWrapper.apply("(instr(delete_phone_id, '" + receiverId + "') is null or instr(delete_phone_id, '" + receiverId + "') = 0)");
             int noReadMessageCount = lifeMessageMapper.selectCount(messageWrapper);
 
             // 查询未读通知数量

alien-store/src/main/java/shop/alien/store/service/impl/ManagementInfoServiceImpl.java

@@ -10,16 +10,20 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
 import shop.alien.entity.store.*;
 import shop.alien.entity.store.vo.ManagementInfoVo;
 import shop.alien.mapper.*;
 import shop.alien.store.service.ManagementInfoService;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import shop.alien.util.ali.AliOSSUtil;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.*;
@@ -53,6 +57,8 @@ public class ManagementInfoServiceImpl implements ManagementInfoService {
 
     private final StoreUserMapper storeUserMapper;
 
+    private final AliOSSUtil aliOSSUtil;
+
     @Override
     public IPage<ManagementInfo> getAllManagementInfo(int pageNo, int pageSize, String storeName) {
         IPage<LifeDiscountCoupon> iPage = new Page<>(pageNo, pageSize);
@@ -75,6 +81,7 @@ public class ManagementInfoServiceImpl implements ManagementInfoService {
             for (StoreIncomeDetailsRecord storeIncomeDetailsRecord : storeIncomeDetailsRecords) {
                 storeIncomeDetailsCount += storeIncomeDetailsRecord.getMoney();
             }
+            storeIncomeDetailsCount = Math.floor(storeIncomeDetailsCount/1000000*100)/100;
             managementInfo.setAccountFrozen(storeIncomeDetailsCount);
         }
         return allManagementInfo;
@@ -113,38 +120,54 @@ public class ManagementInfoServiceImpl implements ManagementInfoService {
         ManagementInfoVo allWrittenOffAmount = managementInfoMapper.getAllWrittenOffAmount(startDate, endDate, null);
         //查询总提现金额
         ManagementInfoVo totalWithdrawalAmount = managementInfoMapper.getTotalWithdrawalAmount(startDate, endDate, null);
-        //查询已解冻金额
+        //查询已提现金额（根据时间查询）
+        ManagementInfoVo withdrawalAmount = managementInfoMapper.getWithdrawalAmount(startDate, endDate, null);
+        //查询总订单金额（根据时间查询）
+        ManagementInfoVo orderAmount = managementInfoMapper.getOrderAmount(startDate, endDate, null);
+        //查询总交易金额（根据时间查询）
+        ManagementInfoVo transactionAmount = managementInfoMapper.getTransactionAmount(startDate, endDate, null);
+        //查询总核销金额（根据时间查询）
+        ManagementInfoVo writtenOffAmount = managementInfoMapper.getWrittenOffAmount(startDate, endDate, null);
+
+        //查询已冻结金额
         List<StoreIncomeDetailsRecord> storeIncomeDetailsRecords = storeIncomeDetailsRecordMapper
                 .selectList(
                         new LambdaQueryWrapper<StoreIncomeDetailsRecord>()
                                 .gt(StoreIncomeDetailsRecord::getCreatedTime, threeDaysAgoMidnight)
+                                .gt(StoreIncomeDetailsRecord::getCreatedTime, startDate)
+                                .lt(StoreIncomeDetailsRecord::getCreatedTime, endDate)
                 );
         Double storeIncomeDetailsCount = 0d;
         for (StoreIncomeDetailsRecord storeIncomeDetailsRecord : storeIncomeDetailsRecords) {
             storeIncomeDetailsCount += storeIncomeDetailsRecord.getMoney();
         }
+
         //存入账单排名
         result.put("billingRanking", billingRanking);
         //存入已付款金额
-        result.put("amountPaid", amountPaid.getAmountPaid());
-        //存入总交易金额
-        result.put("totalTransactionAmount", totalTransactionAmount.getTotalTransactionAmount());
-        //存入交易笔数
-        result.put("transactionNumber", transactionNumber.getTransactionNumber());
+        result.put("amountPaid", Math.floor(amountPaid.getAmountPaid()/10000*100)/100);
+
+        //存入冻结未提现金额
+        result.put("unwithdrawnAmountsFrozen", Math.floor((withdrawalAmount.getTotalWithdrawalAmount() - storeIncomeDetailsCount)/10000*100)/100);
+        //存入未解冻金额
+        result.put("freezeAmounts", Math.floor(storeIncomeDetailsCount/10000*100)/100);
+        // 已提现金额
+        result.put("withdrawalAmount", Math.floor(withdrawalAmount.getTotalWithdrawalAmount()/10000*100)/100);
         //存入未核销金额
-        result.put("amountNotWrittenOff", allOrderAmount.getAllOrderAmount() - allWrittenOffAmount.getAllWrittenOffAmount());
+        result.put("amountNotWrittenOff", Math.floor((orderAmount.getAllOrderAmount() - writtenOffAmount.getAllWrittenOffAmount())/10000*100)/100);
+        //存入交易笔数
+        result.put("transactionNumber", Math.floor(transactionNumber.getTransactionNumber()/10000*100)/100);
         //存入已核销金额
-        result.put("amountWrittenOff", allWrittenOffAmount.getAllWrittenOffAmount());
-        //存入已冻结未提现金额
-        result.put("unwithdrawnAmountsFrozen", totalWithdrawalAmount.getTotalWithdrawalAmount() - storeIncomeDetailsCount);
-
+        result.put("amountWrittenOff", Math.floor(writtenOffAmount.getAllWrittenOffAmount()/10000*100)/100);
+        //存入总交易金额
+        result.put("totalTransactionAmount", Math.floor(transactionAmount.getTotalTransactionAmount()/10000*100)/100);
         return result;
     }
 
     @Override
-    public IPage<ManagementInfoVo> getStoreOrderDetail(int pageNo, int pageSize, String storeId) {
+    public IPage<ManagementInfoVo> getStoreOrderDetail(int pageNo, int pageSize, String storeId, String orderNo, String userId, String userName) {
         IPage<ManagementInfoVo> iPage = new Page<>(pageNo, pageSize);
-        IPage<ManagementInfoVo> storeOrderDetail = managementInfoMapper.getStoreOrderDetail(iPage, storeId);
+        IPage<ManagementInfoVo> storeOrderDetail = managementInfoMapper.getStoreOrderDetail(iPage, storeId, orderNo, userId, userName);
         return storeOrderDetail;
     }
 
@@ -157,6 +180,13 @@ public class ManagementInfoServiceImpl implements ManagementInfoService {
 
     @Override
     public HashMap<String, Object> storeDetailBillingStatistics(String storeId) {
+        // 获取当前日期
+        LocalDate currentDate = LocalDate.now();
+        // 计算三天前的日期
+        LocalDate threeDaysAgo = currentDate.minusDays(3);
+        // 设置时间为当天的 0 点
+        LocalDateTime threeDaysAgoMidnight = threeDaysAgo.atStartOfDay();
+
         HashMap<String, Object> result = new HashMap<>();
         //查询总交易金额
         ManagementInfoVo allOrderAmount = managementInfoMapper.getAllOrderAmount(null, null, storeId);
@@ -167,15 +197,39 @@ public class ManagementInfoServiceImpl implements ManagementInfoService {
         //查询核验金额
         ManagementInfoVo verificationAmount = managementInfoMapper.getVerificationAmount(storeId);
 
+        //查询已提现金额
+        ManagementInfoVo totalWithdrawalAmount = managementInfoMapper.getTotalWithdrawalAmount(null, null, storeId);
+
+        //查询冻结金额
+        List<StoreIncomeDetailsRecord> storeIncomeDetailsRecords = storeIncomeDetailsRecordMapper
+                .selectList(
+                        new LambdaQueryWrapper<StoreIncomeDetailsRecord>()
+                                .gt(StoreIncomeDetailsRecord::getCreatedTime, threeDaysAgoMidnight)
+                                .eq(StoreIncomeDetailsRecord::getStoreId, storeId)
+                );
+        Double storeIncomeDetailsCount = 0d;
+        for (StoreIncomeDetailsRecord storeIncomeDetailsRecord : storeIncomeDetailsRecords) {
+            storeIncomeDetailsCount += storeIncomeDetailsRecord.getMoney();
+        }
+
+
         //存入已付款金额
-        result.put("allOrderAmount", allOrderAmount.getAllOrderAmount());
+        result.put("allOrderAmount", Math.floor(allOrderAmount.getAllOrderAmount()/10000*100)/100);
         //存入总交易金额
         result.put("userCount", userCount.getUserCount());
         //存入交易笔数
-        result.put("orderTransactionNumber", orderTransactionNumber.getOrderTransactionNumber());
-        //存入交易笔数
-        result.put("verificationAmount", verificationAmount.getVerificationAmount());
+        result.put("orderTransactionNumber", Math.floor(orderTransactionNumber.getOrderTransactionNumber()/10000*100)/100);
+        //存入核验金额
+        result.put("verificationAmount", Math.floor(verificationAmount.getVerificationAmount()/10000*100)/100);
+
+        //已提现金额
+        result.put("totalWithdrawalAmount", Math.floor(totalWithdrawalAmount.getTotalWithdrawalAmount()/10000*100)/100);
 
+        //冻结金额
+        result.put("freezeAmounts", Math.floor(storeIncomeDetailsCount/10000*100)/100);
+
+        //冻结待提现金额
+        result.put("unwithdrawnAmountsFrozen", Math.floor(storeIncomeDetailsCount/10000*100)/100);
         return result;
     }
 
@@ -504,7 +558,16 @@ public class ManagementInfoServiceImpl implements ManagementInfoService {
     }
 
     public String generateReceiptFile(String storeName, String storeAccount, String storePhone, String invoiceAmount, String amountPaid, String paymentTime, String fileName) {
-        String filePath = "";
+        String filePath = excelPath + excelGeneratePath + fileName + ".xlsx";
+        String osName = System.getProperty("os.name").toLowerCase();
+        if (osName.contains("win")) {
+            filePath = "d:/" + filePath;
+            String substring = filePath.substring(0, filePath.lastIndexOf("/"));
+            File dir = new File(substring);
+            if (!dir.exists()) {
+                dir.mkdirs();
+            }
+        }
         // 创建 File 对象
         File file = new File(excelPath + excelGeneratePath + fileName + ".xlsx");
         // 判断文件是否存在
@@ -512,8 +575,8 @@ public class ManagementInfoServiceImpl implements ManagementInfoService {
             filePath = fileUrl + "excel" + excelGeneratePath + fileName + ".xlsx";
             return filePath;
         }
-
-        try (FileInputStream fis = new FileInputStream(excelPath + excelClearingReceipt);
+        String templateUrl = fileUrl +"excel/" +excelClearingReceipt;
+        try (FileInputStream fis = toFileInputStream(downloadAsInputStream(templateUrl));
              Workbook workbook = new XSSFWorkbook(fis)) {
             // 获取第一个工作表
             Sheet sheet = workbook.getSheetAt(0);
@@ -581,14 +644,41 @@ public class ManagementInfoServiceImpl implements ManagementInfoService {
                 sheet.autoSizeColumn(i);
             }
             // 保存填充后的工作簿到本地文件
-            try (FileOutputStream fos = new FileOutputStream(excelPath + excelGeneratePath + fileName + ".xlsx")) {
+//            try (FileOutputStream fos = new FileOutputStream(excelPath + excelGeneratePath + fileName + ".xlsx")) {
+//                workbook.write(fos);
+//                filePath = fileUrl + "excel" + excelGeneratePath + fileName + ".xlsx";
+//            }
+            try (FileOutputStream fos = new FileOutputStream(filePath)) {
                 workbook.write(fos);
-                filePath = fileUrl + "excel" + excelGeneratePath + fileName + ".xlsx";
             }
+
         } catch (IOException e) {
             e.printStackTrace();
         }
-        return filePath;
+
+        return aliOSSUtil.uploadFile(new File(filePath), "excel/" + fileName + ".xlsx");
+    }
+
+    public InputStream downloadAsInputStream(String fileUrl) throws IOException {
+        URL url = new URL(fileUrl);
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        connection.setRequestMethod("GET");
+        return connection.getInputStream(); // 直接返回 HTTP 流
+    }
+    public static FileInputStream toFileInputStream(InputStream inputStream) throws IOException {
+        Path tempFile = Files.createTempFile("temp-", ".tmp");
+        tempFile.toFile().deleteOnExit();
+        try (InputStream is = inputStream) {
+            Files.copy(is, tempFile, StandardCopyOption.REPLACE_EXISTING);
+        }
+        return new FileInputStream(tempFile.toFile());
+    }
+    public FileInputStream getExcelTemplate() throws IOException {
+        // 1. 通过 ClassPathResource 获取文件
+        ClassPathResource resource = new ClassPathResource("templates/clearing_receipt.xlsx");
+        // 2. 转换为 FileInputStream（仅在文件系统有效，JAR 内会报错）
+        File file = resource.getFile(); // 注意：JAR 中会抛出 FileNotFoundException
+        return new FileInputStream(file);
     }
 
 //    public static void main(String[] args) {

alien-store/src/main/java/shop/alien/store/service/impl/PlatformStoreCouponServiceImpl.java

@@ -10,11 +10,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import shop.alien.entity.store.LifeCoupon;
-import shop.alien.entity.store.LifeGroupBuyMain;
-import shop.alien.entity.store.StoreImg;
-import shop.alien.entity.store.StoreInfo;
-import shop.alien.entity.store.excelVo.LifeUserViolationExcelVO;
 import shop.alien.entity.store.*;
 import shop.alien.entity.store.excelVo.StoreCouponStatusVo;
 import shop.alien.entity.store.excelVo.util.ExcelGenerator;
@@ -507,8 +502,6 @@ public class PlatformStoreCouponServiceImpl implements PlatformStoreCouponServic
         LocalDateTime nowDate = LocalDateTime.now(); // 获取当前时间
 
         // 格式化日期
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        String formattedEndDate = "";
         LocalDateTime endDateTime = lifeGroupBuyMainVo.getEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
         // 调整结束时间为前一天的23:59:59
         endDateTime = endDateTime.minusDays(1).withHour(23).withMinute(59).withSecond(59);
@@ -536,12 +529,14 @@ public class PlatformStoreCouponServiceImpl implements PlatformStoreCouponServic
             lifeGroupBuyMainVo.setExpiredState("1"); // 当前时间超过 endDate → 已到期
         }
         // 不可用日期
-        String afterSemicolon = lifeGroupBuyMain.getDisableDateValue().split(";")[1];
-        if (StringUtils.isNotEmpty(afterSemicolon)) {
-            List<String> collectUnavailableDate = Arrays.stream(afterSemicolon.split(",")).map(String::trim).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(collectUnavailableDate)) {
-                List<EssentialHolidayComparison> essentialHolidayComparisons = essentialHolidayComparisonMapper.selectList(new LambdaQueryWrapper<EssentialHolidayComparison>().in(EssentialHolidayComparison::getId, collectUnavailableDate));
-                lifeGroupBuyMainVo.setEssentialHolidayComparisonList(essentialHolidayComparisons);
+        if(lifeGroupBuyMainVo.getDisableDateType()==1){
+            String afterSemicolon = lifeGroupBuyMain.getDisableDateValue().split(";")[1];
+            if (StringUtils.isNotEmpty(afterSemicolon)) {
+                List<String> collectUnavailableDate = Arrays.stream(afterSemicolon.split(",")).map(String::trim).collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(collectUnavailableDate)) {
+                    List<EssentialHolidayComparison> essentialHolidayComparisons = essentialHolidayComparisonMapper.selectList(new LambdaQueryWrapper<EssentialHolidayComparison>().in(EssentialHolidayComparison::getId, collectUnavailableDate));
+                    lifeGroupBuyMainVo.setEssentialHolidayComparisonList(essentialHolidayComparisons);
+                }
             }
         }
         return lifeGroupBuyMainVo;

alien-store/src/main/java/shop/alien/store/service/impl/StoreIncomeDetailsRecordServiceImpl.java

@@ -1,24 +1,21 @@
 package shop.alien.store.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.*;
-import shop.alien.entity.store.*;
 import shop.alien.entity.store.vo.StoreIncomeDetailsRecordVo;
+import shop.alien.mapper.LifeUserOrderMapper;
 import shop.alien.mapper.StoreCashOutRecordMapper;
 import shop.alien.mapper.StoreIncomeDetailsRecordMapper;
 import shop.alien.mapper.StoreUserMapper;
@@ -30,12 +27,10 @@ import shop.alien.util.common.ListToPage;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -58,6 +53,7 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
     private final AliApi aliApi;
 
     private final StoreIncomeDetailsRecordMapper storeIncomeDetailsRecordMapper;
+    private final LifeUserOrderMapper lifeUserOrderMapper;
 
 
     /**
@@ -216,6 +212,9 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
     public String approveCashOut(Integer cashOutId, String approveStatus, String failReason) {
         if (cashOutId != null && cashOutId > 0 && StringUtils.isNotBlank(approveStatus)) {
             StoreCashOutRecord storeCashOutRecord = storeCashOutRecordMapper.selectById(cashOutId);
+            if(!(storeCashOutRecord.getPaymentStatus() == 3)){
+                return "付款状态异常";
+            }
             if (approveStatus.equals("0")) {
                 //同意，开始提现
                 Integer storeUserId = storeCashOutRecord.getStoreUserId();
@@ -235,19 +234,25 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
                     storeCashOutRecord.setPaymentStatus(1);//提现成功
                     storeCashOutRecord.setApproveTime(new Date());// 审批时间
                     storeCashOutRecord.setPayDate(new Date());//支付时间
-
+                    storeCashOutRecord.setPaymentDate(new Date());//支付到账时间
                     //减少账户余额
                     storeUserMapper.updateById(new StoreUser(storeCashOutRecord.getStoreId(), storeUser.getMoney() - storeCashOutRecord.getMoney() - storeCashOutRecord.getCommission()));
+                    storeCashOutRecordMapper.updateById(storeCashOutRecord);
+                    return "付款成功";
+
                 } else {
                     // 提现失败
                     storeCashOutRecord.setPaymentStatus(2);
                     storeCashOutRecord.setApproveTime(new Date());// 审批时间
                     storeCashOutRecord.setFailReason("支付失败");
+                    storeCashOutRecord.setPayDate(new Date());//支付时间
+                    storeCashOutRecordMapper.updateById(storeCashOutRecord);
+                    return "付款失败";
                 }
-                storeCashOutRecordMapper.updateById(storeCashOutRecord);
             } else {
                 storeCashOutRecord.setPaymentStatus(4);
                 storeCashOutRecord.setFailReason(failReason);
+                storeCashOutRecord.setApproveTime(new Date());// 审批时间
                 storeCashOutRecordMapper.updateById(storeCashOutRecord);
                 // 拒绝将账单中的提现记录置空
                 LambdaUpdateWrapper<StoreIncomeDetailsRecord> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
@@ -255,6 +260,7 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
                         .eq(StoreIncomeDetailsRecord::getCashOutId, storeCashOutRecord.getId())
                         .set(StoreIncomeDetailsRecord::getCashOutId, "");
                  int result = storeIncomeDetailsRecordMapper.updateByCashOutId(storeCashOutRecord.getStoreId(), storeCashOutRecord.getId());
+                return "已拒绝";
             }
         }
         return "审批成功";
@@ -475,4 +481,13 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
         }
         return vo;
     }
+
+    @Override
+    public Integer todayOrderCount(Integer storeId) {
+        LambdaQueryWrapper<LifeUserOrder> wrapper = new LambdaQueryWrapper<>();
+        LocalDate now = LocalDate.now();
+        wrapper.eq(LifeUserOrder::getStoreId, storeId)
+                .between(LifeUserOrder::getBuyTime, now + " 00:00:00", now + " 23:59:59");
+        return lifeUserOrderMapper.selectCount(wrapper);
+    }
 }

alien-store/src/main/java/shop/alien/store/service/impl/StoreUserServiceImpl.java

@@ -772,9 +772,9 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
             return R.fail("未查询到用户");
         }
         if( null == storeUser.getPayPassword()){
-            return R.fail("false");
+            return R.fail("用户未设置支付密码");
         } else if(null != password){
-             return password.equals(storeUser.getPayPassword())? R.success("true"):R.fail("false");
+             return password.equals(storeUser.getPayPassword())? R.success("true"):R.fail("密码错误");
         }
         return R.success("true");
     }