Merge remote-tracking branch 'origin/master_exclusive_shop_20250718' into master_fhhx_20250718

fs-company/src/main/java/com/fs/company/controller/live/LiveOrderController.java

@@ -226,10 +226,9 @@ public class LiveOrderController extends BaseController
     public AjaxResult getInfo(@PathVariable("orderId") String orderId)
     {
         LiveOrder liveOrder = liveOrderService.selectLiveOrderByOrderId(orderId);
-        if (!"00".equals(SecurityUtils.getLoginUser().getUser().getUserType())) {
             liveOrder.setUserPhone(ParseUtils.parsePhone(liveOrder.getUserPhone()));
             liveOrder.setUserAddress(ParseUtils.parseAddress(liveOrder.getUserAddress()));
-        }
+
         return AjaxResult.success(liveOrder);
     }
 

fs-service-system/src/main/java/com/fs/company/mapper/CompanyMoneyLogsMapper.java

@@ -92,7 +92,7 @@ public interface CompanyMoneyLogsMapper
 
 
     @Select({"<script> " +
-            "select l.*,c.company_name ,o.order_code,o.user_phone,p.bank_transaction_id,p.pay_type_code,p.pay_code,l.type as pay_type_code " +
+            "select l.*,c.company_name ,o.order_code,o.user_phone,p.bank_transaction_id,p.pay_type_code,p.pay_code " +
             "from company_money_logs l left join company c on c.company_id=l.company_id   " +
             "left join fs_store_order o on o.id=l.business_id " +
             "left join fs_store_payment p on o.id=p.order_id "+
@@ -129,7 +129,7 @@ public interface CompanyMoneyLogsMapper
     List<CompanyMoneyLogsVO> selectCompanyMoneyLogsMallVOList(@Param("maps") CompanyMoneyLogsParam companyMoneyLogs);
 
     @Select({"<script> " +
-            "select l.*,c.company_name ,p.bank_transaction_id,p.pay_type_code,l.type as pay_type_code " +
+            "select l.*,c.company_name ,p.bank_transaction_id,p.pay_type_code " +
             "from company_money_logs l left join company c on c.company_id=l.company_id   " +
             "left join fs_store_payment p on p.payment_id=l.business_id "+
             "where  (l.logs_type=8 || l.logs_type=9)  " +

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyMoneyLogsServiceImpl.java

@@ -2,6 +2,9 @@ package com.fs.company.service.impl;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.fs.common.utils.DateUtils;
@@ -127,11 +130,26 @@ public class CompanyMoneyLogsServiceImpl implements ICompanyMoneyLogsService
     @Override
     public List<CompanyMoneyLogsExportVO> selectCompanyMoneyLogsExportVOList(CompanyMoneyLogs companyMoneyLogs) {
         List<CompanyMoneyLogsExportVO> companyMoneyLogsExportVOS = companyMoneyLogsMapper.selectCompanyMoneyLogsExportVOList(companyMoneyLogs);
+        if (ObjectUtil.isEmpty(companyMoneyLogsExportVOS)){
+            return companyMoneyLogsExportVOS;
+        }
+        List<String> businessIdList =
+                companyMoneyLogsExportVOS.stream()
+                        .filter(vo -> Integer.valueOf(1).equals(vo.getType()))
+                        .map(CompanyMoneyLogsExportVO::getBusinessId)
+                        .filter(Objects::nonNull)
+                        .distinct()
+                        .collect(Collectors.toList());
+        if (ObjectUtil.isEmpty(businessIdList)) {
+            return companyMoneyLogsExportVOS;
+        }
+        Map<String, String> orderCodeMap = liveOrderMapper.selectOrderCodeMapByOrderIds(businessIdList);
+
         for (CompanyMoneyLogsExportVO item : companyMoneyLogsExportVOS) {
             // 如果是直播订单
-            if(ObjectUtil.equal(item.getType(),1)) {
-                String orderCode = liveOrderMapper.selectLiveOrderCodeByOrderId(item.getBusinessId());
-                if(ObjectUtil.isNotNull(orderCode)) {
+            if(Integer.valueOf(1).equals(item.getType())) {
+                String orderCode = orderCodeMap.get(item.getBusinessId());
+                if (ObjectUtil.isNotNull(orderCode)) {
                     item.setOrderCode(orderCode);
                 }
             }

fs-service-system/src/main/java/com/fs/live/domain/LiveOrder.java

@@ -81,7 +81,7 @@ public class LiveOrder extends BaseEntity {
     private BigDecimal payMoney;
 
     @Excel(name = "物流代收金额",cellType= Excel.ColumnType.NUMERIC)
-    private BigDecimal payDelivery;
+    private BigDecimal payDelivery = BigDecimal.ZERO;
 
     @Excel(name = "支付邮费", cellType= Excel.ColumnType.NUMERIC)
     private BigDecimal payPostage;
@@ -188,7 +188,7 @@ public class LiveOrder extends BaseEntity {
     private String cartId;
 
     /** 订单商品总数 */
-//    @Excel(name = "订单商品总数")
+    @Excel(name = "订单商品总数")
     private String totalNum;
 
 

fs-service-system/src/main/java/com/fs/live/mapper/LiveOrderMapper.java

@@ -8,11 +8,10 @@ import com.fs.live.vo.LiveOrderListVo;
 import com.fs.live.vo.LiveOrderQueryVO;
 import com.fs.live.vo.LiveOrderVo;
 import com.fs.store.domain.FsStoreOrder;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单Mapper接口
@@ -32,6 +31,10 @@ public interface LiveOrderMapper {
     @Select("select order_code from live_order where order_id=#{orderId}")
     String selectLiveOrderCodeByOrderId(@Param("orderId") String orderId);
 
+    @MapKey("orderId")
+    Map<String, String> selectOrderCodeMapByOrderIds(@Param("orderIds") List<String> orderIds);
+
+
     /**
      * 查询订单列表
      *

fs-service-system/src/main/java/com/fs/live/service/impl/LiveDataServiceImpl.java

@@ -917,6 +917,9 @@ public class LiveDataServiceImpl implements ILiveDataService {
             if (order.getPayPrice() != null) {
                 productSales.setSalesAmount(productSales.getSalesAmount().add(order.getPayPrice()));
             }
+            if (order.getPayMoney() != null) {
+                productSales.setSalesAmount(productSales.getSalesAmount().add(order.getPayMoney()));
+            }
         }
 
         List<ProductSalesVo> result = new ArrayList<>(productSalesMap.values());

fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -2263,6 +2263,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
             Long productId = goodsVo.getProductId();
             if (productId != null) {
                 FsStoreProduct storeProduct = productWarehouseMap.get(productId);
+                goodsVo.setTotalNum(liveOrder.getTotalNum());
                 if (storeProduct != null) {
                     goodsVo.setWarehouseCode(storeProduct.getWarehouseCode());
                 }

fs-service-system/src/main/java/com/fs/live/vo/LiveGoodsVo.java

@@ -19,6 +19,9 @@ public class LiveGoodsVo {
     private BigDecimal otPrice;
     private Long storeId;
 
+    //商品数量
+    private String totalNum;
+
     // 是否收藏
     private Boolean isFavorite;
     private Boolean isShow;

fs-service-system/src/main/resources/mapper/live/LiveMapper.xml

@@ -87,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (#{companyName} = '总台' and a.company_id is null)
             )
         </if>
+        <if test="liveId != null "> and a.live_id = #{liveId}</if>
         <if test="talentId != null "> and talent_id = #{talentId}</if>
         <if test="liveName != null  and liveName != ''"> and live_name like concat('%', #{liveName}, '%')</if>
         <if test="liveDesc != null  and liveDesc != ''"> and live_desc = #{liveDesc}</if>

fs-service-system/src/main/resources/mapper/live/LiveOrderMapper.xml

@@ -167,8 +167,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliverySendTimeStart != null and deliverySendTimeEnd != null and deliverySendTimeStart != '' and deliverySendTimeEnd!= ''">
                 and a.delivery_send_time between CONCAT(#{deliverySendTimeStart}, ' 00:00:00') and CONCAT(#{deliverySendTimeEnd}, ' 23:59:59')
             </if>
-            <if test="payTimeStart != null and payTimeEnd != null and payTimeStart!='' and payTimeEnd!=''">
-                and a.pay_time between CONCAT(#{payTimeStart}, ' 00:00:00') and CONCAT(#{payTimeEnd}, ' 23:59:59')
+            <if test="payStartTime != null and payEndTime != null and payStartTime!='' and payEndTime!=''">
+                and a.pay_time between CONCAT(#{payStartTime}, ' 00:00:00') and CONCAT(#{payEndTime}, ' 23:59:59')
             </if>
             <if test="finishTimeStart != null and finishTimeEnd != null and finishTimeStart != '' and finishTimeEnd!=''">
                 and a.finish_time between CONCAT(#{finishTimeStart}, ' 00:00:00') and CONCAT(#{finishTimeEnd}, ' 23:59:59')
@@ -457,4 +457,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND create_time < DATE_SUB(NOW(), INTERVAL 1800 MINUTE)
         ]]>
     </select>
+
+    <select id="selectOrderCodeMapByOrderIds" resultType="java.util.HashMap">
+        select
+        order_id,
+        order_code
+        from live_order
+        where order_id in
+        <foreach collection="orderIds" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
 </mapper>

fs-user-app/src/main/java/com/fs/app/facade/impl/LiveFacadeServiceImpl.java

@@ -27,6 +27,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -60,7 +61,7 @@ public class LiveFacadeServiceImpl extends BaseController implements LiveFacadeS
     @Autowired
     private ILiveCompletionPointsRecordService completionPointsRecordService;
 
-
+    private static final ZoneId ZONE_ID = ZoneId.of("GMT+8");
     @Override
     public R liveList(PageRequest pageRequest) {
         int start = (pageRequest.getCurrentPage() - 1) * pageRequest.getPageSize();
@@ -226,8 +227,10 @@ public class LiveFacadeServiceImpl extends BaseController implements LiveFacadeS
         } else {
             liveVo.setTodayRewardReceived(false);
         }
-
-        return R.ok().put("data", liveVo);
+        return R.ok().put("serviceTime", System.currentTimeMillis())
+                .put("serviceStartTime", liveVo.getStartTime() == null ? null : liveVo.getStartTime().atZone(ZONE_ID).toInstant().toEpochMilli())
+                .put("serviceEndTime", liveVo.getFinishTime() == null ? null : liveVo.getFinishTime().atZone(ZONE_ID).toInstant().toEpochMilli())
+                .put("data", liveVo);
     }
 
     /**