fix

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

@@ -1,6 +1,7 @@
 package com.fs.hisStore.service.impl;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
@@ -212,7 +213,7 @@ public class FsStoreProductPackageScrmServiceImpl implements IFsStoreProductPack
     @Override
     public int updateFsStoreProductPackagesByCompany(Long[] packageIds, Long status, Long[] companyIds) {
         //判断套餐商品所属公司
-        Set<String> companySet = new LinkedHashSet<>();
+        Set<Long> companySet = new LinkedHashSet<>();
         List<FsStoreProductPackageScrm> list = fsStoreProductPackageMapper.selectFsPackageListByIds(packageIds);
         if (list != null && !list.isEmpty()) {
             List<Long> productIds = new ArrayList<>();
@@ -222,11 +223,13 @@ public class FsStoreProductPackageScrmServiceImpl implements IFsStoreProductPack
                     List<StorePackageProductDTO> dtos = JSON.parseArray(products, StorePackageProductDTO.class);
                     if (dtos != null && !dtos.isEmpty()) {
                         dtos.forEach(dto -> {
-                            productIds.add(dto.getId());
+                            FsStoreProductAttrValueScrm attrValue=fsStoreProductAttrValueMapper.selectFsStoreProductAttrValueById(dto.getId());
+                            if (attrValue != null) {
+                                productIds.add(attrValue.getProductId());
+                            }
                         });
                     }
                 }
-
             }
             if (!productIds.isEmpty()) {
                 List<FsStoreProductScrm> productScrmList = fsStoreProductMapper.getStoreProductInProductIds(productIds);
@@ -234,7 +237,7 @@ public class FsStoreProductPackageScrmServiceImpl implements IFsStoreProductPack
                     productScrmList.forEach(fsStoreProductScrm -> {
                         String companyIdsTemp = fsStoreProductScrm.getCompanyIds();
                         if (StringUtils.isNotBlank(companyIdsTemp)) {
-                            List<String> companyIdList = Arrays.asList(companyIdsTemp.split(","));
+                            List<Long> companyIdList = Arrays.stream(companyIdsTemp.split(",")).map(Long::valueOf).collect(Collectors.toList());
                             if (!companyIdList.isEmpty()) {
                                 companySet.addAll(companyIdList);
                             }
@@ -246,7 +249,7 @@ public class FsStoreProductPackageScrmServiceImpl implements IFsStoreProductPack
         StringBuilder companyIdsStr = new StringBuilder();
         if (companyIds != null && companyIds.length>0){
             for (Long companyId : companyIds) {
-                if (!companySet.contains(companyId.toString())) {
+                if (!companySet.contains(companyId)) {
                     return 0;
                 }
                 companyIdsStr.append(companyId).append(",");

fs-service/src/main/resources/mapper/hisStore/FsStoreProductPackageScrmMapper.xml

@@ -172,14 +172,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
     <update id="updateFsStoreProductPackagesByCompany">
-        update  fs_store_product_package_scrm set
-        <if test="status != null">
-            status = #{status},
-        </if>
-
-        <if test="companyIds !=null">
-            company_ids = #{companyIds},
-        </if>
+        update  fs_store_product_package_scrm
+        <trim prefix="set" suffixOverrides=",">
+            <if test="status != null">
+                status = #{status},
+            </if>
+            <if test="companyIds != null">
+                company_ids = #{companyIds},
+            </if>
+        </trim>
         where package_id in
         <foreach item="packageId" collection="packageIds" open="(" separator="," close=")">
             #{packageId}

fs-user-app/src/main/java/com/fs/app/controller/StoreOrderController.java

@@ -5,6 +5,7 @@ import com.fs.app.annotation.Login;
 
 import com.fs.common.utils.CloudHostUtils;
 import com.fs.his.dto.ExpressInfoDTO;
+import com.fs.his.enums.FsStoreOrderStatusEnum;
 import com.fs.his.param.BillListParam;
 import com.fs.app.param.FsStoreOrderExpressParam;
 import com.fs.app.param.FsStoreOrderFinishParam;
@@ -18,6 +19,7 @@ import com.fs.his.param.*;
 import com.fs.his.service.*;
 import com.fs.his.vo.FsStoreOrderItemListUVO;
 import com.fs.his.vo.FsStoreOrderListUVO;
+import com.fs.hisStore.enums.OrderInfoEnum;
 import com.fs.ybPay.service.IPayService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -87,7 +89,7 @@ public class StoreOrderController extends  AppBaseController {
         SimpleDateFormat format = new   SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String payLimitTime = format.format(calendar.getTime() );
         //处理是否可以申请售后
-        Integer isAfterSales=0;
+        Integer isAfterSales=1;
 //        if(order.getStatus().equals(FsStoreOrderStatusEnum.STATUS_4.getValue())) {
 //            //已完成订单
 //            isAfterSales=1;
@@ -106,7 +108,7 @@ public class StoreOrderController extends  AppBaseController {
 //        else if(order.getStatus()==2||order.getStatus()==3){
 //            isAfterSales=1;
 //        }
-        return R.ok().put("order",order).put("items",list).put("payLimitTime",payLimitTime);
+        return R.ok().put("order",order).put("items",list).put("payLimitTime",payLimitTime).put("isAfterSales",isAfterSales);
     }
 
     @Login