Merge remote-tracking branch 'origin/master'

fs-admin/src/main/java/com/fs/hisStore/task/MallStoreTask.java

@@ -484,7 +484,7 @@ public class MallStoreTask
     //每天执行一次
     public void syncExpress()
     {
-        List<Long> ids =fsStoreOrderMapper.selectSyncExpressIds();
+        List<Long> ids =fsStoreOrderMapper.selectSyncExpressIdsNoDate();
 
         for (Long id : ids) {
             FsStoreOrderExpressEditParam param =new FsStoreOrderExpressEditParam();

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

@@ -63,9 +63,9 @@ public class OrderController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(MergedOrderQueryParam param)
     {
-        if(param.getOrderTypeFilter() == null || param.getOrderTypeFilter().equals("2")){
+/*        if(param.getOrderTypeFilter() == null || param.getOrderTypeFilter().equals("2")){
             return getDataTable(new ArrayList<>());
-        }
+        }*/
         CompanyUser user = SecurityUtils.getLoginUser().getUser();
         param.setCompanyId(user.getCompanyId());
        if (user.getUserType().equals("01")){

fs-company/src/main/java/com/fs/company/controller/store/FsUserAddressController.java

@@ -11,6 +11,7 @@ import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.SecurityUtils;
 import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.config.cloud.CloudHostProper;
 import com.fs.his.domain.FsUserAddress;
 import com.fs.his.dto.AddressInfoDTO;
 import com.fs.his.service.IFsUserAddressService;
@@ -33,6 +34,8 @@ public class FsUserAddressController extends BaseController
     @Autowired
     private IFsUserAddressService fsUserAddressService;
 
+    @Autowired
+    private CloudHostProper cloudHostProper;
     /**
      * 查询用户地址列表
      */
@@ -43,11 +46,14 @@ public class FsUserAddressController extends BaseController
         startPage();
         List<FsUserAddress> list = fsUserAddressService.selectFsUserAddressList(fsUserAddress);
         for (FsUserAddress userAddress : list) {
-            if (userAddress.getPhone()!=null){
-                userAddress.setPhone(userAddress.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-            }
-            if (userAddress.getDetail()!=null&&userAddress.getDetail()!=""){
-                userAddress.setDetail(userAddress.getDetail().substring(0, userAddress.getDetail().length() / 2) + "********");
+            //郑多燕不需要加密
+            if(!"广州郑多燕".equals(cloudHostProper.getCompanyName())){
+                if (userAddress.getPhone()!=null){
+                    userAddress.setPhone(userAddress.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+                }
+                if (userAddress.getDetail()!=null&&userAddress.getDetail()!=""){
+                    userAddress.setDetail(userAddress.getDetail().substring(0, userAddress.getDetail().length() / 2) + "********");
+                }
             }
         }
         return getDataTable(list);

fs-service/src/main/java/com/fs/hisStore/config/StoreConfig.java

@@ -28,4 +28,5 @@ public class StoreConfig implements Serializable {
     private Boolean isWeChatShipping;//是否开启微信发货
     private Boolean scanCodeDiscountEnabled;//是否开启扫码立减金
     private BigDecimal scanCodeDiscountAmount;//扫码立减金额
+    private Boolean checkStock;//是否检查库存，默认关闭
 }

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderScrmMapper.java

@@ -992,6 +992,9 @@ public interface FsStoreOrderScrmMapper
     @Select("select id from fs_store_order_scrm where status = 2  and DATE(pay_time)>='2023-11-1' and DATE(create_time)<='2024-2-7' and company_id is null ")
     List<Long> selectSyncExpressIds();
 
+    @Select("select id from fs_store_order_scrm where status = 2  and DATE(pay_time)>='2023-11-1' and company_id is null ")
+    List<Long> selectSyncExpressIdsNoDate();
+
 
     List<Long> selectAddTuiMoney();
 

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductAttrValueScrmMapper.java

@@ -76,6 +76,12 @@ public interface FsStoreProductAttrValueScrmMapper
     List<FsStoreProductAttrValueScrm> selectFsStoreProductAttrValueByProductId(Long productId);
     @Select("select ifnull(stock,0) from fs_store_product_attr_value_scrm where  id=#{productAttrValueId}")
     int selectFsStoreProductStockById(Long productAttrValueId);
+    
+    /**
+     * 使用行锁查询规格库存
+     */
+    @Select("select ifnull(stock,0) from fs_store_product_attr_value_scrm where id=#{productAttrValueId} for update")
+    Integer selectProductAttrStockForUpdate(@Param("productAttrValueId") Long productAttrValueId);
 
     @Update("update fs_store_product_attr_value_scrm set stock=stock-#{num},sales=sales+#{num}" +
             " where id=#{productAttrValueId} and stock >= #{num} ")

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductScrmMapper.java

@@ -255,6 +255,12 @@ public interface FsStoreProductScrmMapper
     @Update("update fs_store_product_scrm set stock=stock-#{num}, sales=sales+#{num}" +
             " where product_id=#{productId} and stock >= #{num}")
     int decProductAttrStock(@Param("productId")Long productId, @Param("num")Integer cartNum);
+    
+    /**
+     * 使用行锁查询商品库存
+     */
+    @Select("select stock from fs_store_product_scrm where product_id=#{productId} for update")
+    Integer selectProductStockForUpdate(@Param("productId") Long productId);
     @Update("update fs_store_product_scrm set stock=stock+#{num}, sales=sales-#{num}" +
             " where product_id=#{productId}")
     int incStockDecSales( @Param("num")Long num, @Param("productId")Long productId);

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductScrmServiceImpl.java

@@ -99,6 +99,9 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
 
     @Autowired
     private ConfigUtil configUtil;
+    
+    @Autowired
+    private com.fs.system.service.ISysConfigService configService;
 
     @Autowired
     @Qualifier("hzOMSErpGoodsServiceImpl")
@@ -1046,8 +1049,45 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
         return fsStoreProductMapper.selectFsStoreProductByIdQuery(productId,storeId,medicalMallConfig);
     }
 
+    /**
+     * 检查库存（使用行锁）
+     */
+    private void checkStockWithLock(Long productId, Long productAttrValueId, Integer cartNum) {
+        // 检查商品库存
+        Integer productStock = fsStoreProductMapper.selectProductStockForUpdate(productId);
+        if (productStock == null || productStock < cartNum) {
+            FsStoreProductScrm product = fsStoreProductMapper.selectFsStoreProductById(productId);
+            String productName = product != null ? product.getProductName() : "商品";
+            throw new CustomException(productName + "库存不足，当前库存：" + (productStock != null ? productStock : 0) + "，需要数量：" + cartNum);
+        }
+        
+        // 如果有规格，检查规格库存
+        if (productAttrValueId != null) {
+            Integer attrStock = fsStoreProductAttrValueMapper.selectProductAttrStockForUpdate(productAttrValueId);
+            if (attrStock == null || attrStock < cartNum) {
+                FsStoreProductAttrValueScrm attrValue = fsStoreProductAttrValueMapper.selectFsStoreProductAttrValueById(productAttrValueId);
+                String sku = attrValue != null ? attrValue.getSku() : "规格";
+                throw new CustomException("商品规格" + sku + "库存不足，当前库存：" + (attrStock != null ? attrStock : 0) + "，需要数量：" + cartNum);
+            }
+        }
+    }
+    
     @Override
     public void decProductStock(Long productId, Long productAttrValueId, Integer cartNum) {
+        // 检查配置是否开启库存检查
+        try {
+            String configJson = configService.selectConfigByKey("his.store");
+            if (StringUtils.isNotEmpty(configJson)) {
+                com.fs.hisStore.config.StoreConfig config = com.alibaba.fastjson.JSON.parseObject(configJson, com.fs.hisStore.config.StoreConfig.class);
+                if (config != null && Boolean.TRUE.equals(config.getCheckStock())) {
+                    // 使用行锁检查库存
+                    checkStockWithLock(productId, productAttrValueId, cartNum);
+                }
+            }
+        } catch (Exception e) {
+            log.error("检查库存配置失败", e);
+        }
+        
         //处理属性sku
         fsStoreProductAttrValueMapper.decProductAttrStock(productAttrValueId,cartNum);
         fsStoreProductMapper.decProductAttrStock(productId,cartNum);

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

@@ -711,7 +711,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         } else {
             lockKey = "livePayConfirm:lock:" + System.currentTimeMillis();
         }
-        
+
         boolean lockAcquired = false;
         Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
         try {
@@ -1654,6 +1654,8 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                 userService.subLiveTuiMoney(liveOrder);
             }
         }
+        // 删除限购记录
+        deletePurchaseLimitRecordsForLiveOrder(order);
 
         return R.ok();
     }
@@ -3661,6 +3663,12 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         this.payConfirm(1, null, payment.getPayCode(), payment.getTradeNo(), payment.getBankSerialNo(), payment.getBankSerialNo());
     }
 
+    public void deStockIncSale(List<FsStoreCartQueryVO> cartInfo) {
+        for (FsStoreCartQueryVO storeCartVO : cartInfo) {
+            fsStoreProductService.decProductStock(storeCartVO.getProductId(),
+                    storeCartVO.getProductAttrValueId(), storeCartVO.getCartNum());
+        }
+    }
 
     @Override
     @Transactional(rollbackFor = Throwable.class,propagation = Propagation.REQUIRED)
@@ -3690,27 +3698,19 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         if(!"1".equals(fsStoreProduct.getIsAudit()) ) return R.error("商品已下架，购买失败");
         if(liveOrder.getTotalNum() == null || StringUtils.isEmpty(liveOrder.getTotalNum())) liveOrder.setTotalNum("1");
         if(goods.getStock() == null) return R.error("直播间商品库存不足");
-        if(fsStoreProduct.getStock() < Integer.parseInt(liveOrder.getTotalNum()) || goods.getStock() < Integer.parseInt(liveOrder.getTotalNum())) return R.error("抱歉，这款商品已被抢光，暂时无库存～");
+        FsStoreProductAttrValueScrm attrValue = fsStoreProductAttrValueMapper.selectFsStoreProductAttrValueById(liveOrder.getAttrValueId());
+        if(fsStoreProduct.getStock() < Integer.parseInt(liveOrder.getTotalNum()) || goods.getStock() < Integer.parseInt(liveOrder.getTotalNum()) || attrValue.getStock() < Integer.parseInt(liveOrder.getTotalNum())){
+            return R.error("抱歉，这款商品已被抢光，暂时无库存～");
+        }
+
 
         // 检查限购
         Long userId = Long.parseLong(liveOrder.getUserId());
         Integer purchaseNum = Integer.parseInt(liveOrder.getTotalNum());
         checkPurchaseLimitForLiveOrder(userId, liveOrder.getProductId(), purchaseNum);
 
-        FsStoreProductAttrValueScrm attrValue = null;
-        if (!Objects.isNull(liveOrder.getAttrValueId())) {
-            attrValue = fsStoreProductAttrValueMapper.selectFsStoreProductAttrValueById(liveOrder.getAttrValueId());
-        }
-        if (attrValue != null) {
-            attrValue.setStock(attrValue.getStock() - Integer.parseInt(liveOrder.getTotalNum()));
-            attrValue.setSales(attrValue.getSales() + Integer.parseInt(liveOrder.getTotalNum()));
-            fsStoreProductAttrValueMapper.updateFsStoreProductAttrValue(attrValue);
-        }
-        // 更改店铺库存
-        fsStoreProduct.setStock(fsStoreProduct.getStock()-Integer.parseInt(liveOrder.getTotalNum()));
-        fsStoreProduct.setSales(fsStoreProduct.getSales()+Integer.parseInt(liveOrder.getTotalNum()));
-        fsStoreProductScrmMapper.incStockDecSales(Long.valueOf("-" + liveOrder.getTotalNum()),fsStoreProduct.getProductId());
-
+        // 使用 deStockIncSale 方法处理库存和销量
+        deStockIncSale(liveOrder.getProductId(), liveOrder.getAttrValueId(), purchaseNum);
         // 更新直播间库存
         goods.setStock(goods.getStock()-Integer.parseInt(liveOrder.getTotalNum()));
         goods.setSales(goods.getSales()+Integer.parseInt(liveOrder.getTotalNum()));
@@ -3738,6 +3738,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         BigDecimal payPrice = fsStoreProduct.getPrice().multiply(new BigDecimal(liveOrder.getTotalNum()));
         if (attrValue != null) {
             payPrice = attrValue.getPrice().multiply(new BigDecimal(liveOrder.getTotalNum()));
+            fsStoreProduct.setPrice(payPrice);
         }
         // 直播不需要服务费 0915 1735 左
 //        String config=configService.selectConfigByKey("store.config");
@@ -3796,11 +3797,13 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                     dto.setBarCode(fsStoreProductAttrValue.getBarCode());
                     dto.setGroupBarCode(fsStoreProductAttrValue.getGroupBarCode());
                 }
+                dto.setPrice(fsStoreProduct.getPrice());
                 if (attrValue != null) {
                     dto.setBarCode(attrValue.getBarCode());
                     dto.setGroupBarCode(attrValue.getGroupBarCode());
+                    dto.setPrice(attrValue.getPrice());
                 }
-                dto.setPrice(fsStoreProduct.getPrice());
+                //dto.setPrice(fsStoreProduct.getPrice());
                 dto.setProductName(fsStoreProduct.getProductName());
                 dto.setNum(Long.valueOf(liveOrder.getTotalNum()));
 
@@ -3812,7 +3815,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                 liveOrderItem.setJsonInfo(JSON.toJSONString(dto));
                 liveOrderItemMapper.insertLiveOrderItem(liveOrderItem);
 
-                
+
                 redisCache.deleteObject("orderKey:" + liveOrder.getOrderKey());
                 //添加支付到期时间
                 Calendar calendar = Calendar.getInstance();
@@ -3983,8 +3986,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
             goods.setStock(goods.getStock()+Long.parseLong(liveOrder.getTotalNum()));
             // 更新商品库存
             liveGoodsMapper.updateLiveGoods(goods);
-            // 删除限购记录
-            deletePurchaseLimitRecordsForLiveOrder(liveOrder);
+
             // 退券
             this.refundCoupon(order);
             TemplateBean templateBean = TemplateBean.builder()
@@ -4008,25 +4010,33 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
      * @param productId 商品ID
      * @param num 购买数量
      */
+    /**
+     * 减库存加销量（直播订单）
+     */
+    private void deStockIncSale(Long productId, Long attrValueId, Integer num) {
+        // 使用 productService.decProductStock 方法，该方法已包含库存检查逻辑
+        fsStoreProductService.decProductStock(productId, attrValueId, num);
+    }
+    
     private void checkPurchaseLimitForLiveOrder(Long userId, Long productId, Integer num) {
         // 查询商品信息
         FsStoreProductScrm product = fsStoreProductService.selectFsStoreProductById(productId);
         if (product == null) {
             return;
         }
-        
+
         // 如果商品没有设置限购，直接返回
         if (product.getPurchaseLimit() == null || product.getPurchaseLimit() <= 0) {
             return;
         }
-        
+
         // 查询用户已购买的数量
         FsStoreProductPurchaseLimitScrm purchaseLimit = purchaseLimitService.selectByProductIdAndUserId(productId, userId);
         int purchasedNum = 0;
         if (purchaseLimit != null) {
             purchasedNum = purchaseLimit.getNum();
         }
-        
+
         // 检查是否超过限购数量
         if (purchasedNum + num > product.getPurchaseLimit()) {
             int productTotalNum = purchasedNum + num;

fs-service/src/main/java/com/fs/live/vo/MergedOrderVO.java

@@ -96,9 +96,9 @@ public class MergedOrderVO implements Serializable
     /** 支付时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date payTime;
-    @Excel(name = "发货时间")
     /** 发货时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "发货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date deliverySendTime;
 
     /** 总数量（直播订单使用） */

fs-user-app/src/main/java/com/fs/app/controller/live/LiveOrderController.java

@@ -348,8 +348,12 @@ public class LiveOrderController extends AppBaseController
     public AjaxResult getInfo(@PathVariable("orderId") String orderId)
     {
         log.info("获取订单详细信息 参数: {}",orderId);
-
-        return AjaxResult.success(orderService.selectLiveOrderByOrderId(orderId));
+        LiveOrder liveOrder = orderService.selectLiveOrderByOrderId(orderId);
+        //订单总价 临时处理 为 商品支付金额（商品支付金额=订单总价-快递费）
+        if(ObjectUtil.isNull(liveOrder)) {
+            liveOrder.setTotalPrice(liveOrder.getTotalPrice().subtract(liveOrder.getPayDelivery()));
+        }
+        return AjaxResult.success();
     }
 
     @Login