修改商场展示条件

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

@@ -1025,7 +1025,7 @@ public interface FsStoreOrderScrmMapper
 
     List<JSONObject> selectTuiMoneyCounts(Map<String, Object> map);
 
-    @Select("select * from fs_store_payment_scrm where user_id = #{userId} limit 1")
+    @Select("select * from fs_store_order_scrm where user_id = #{userId} limit 1")
     FsStoreOrderScrm selectOrderByUserIdLimit1(Long userId);
 
     List<FsStoreOrderScrm> selectFsStoreOrderStatisticsByUserId(@Param("ids") List<Long> ids);

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

@@ -506,4 +506,12 @@ public interface FsStorePaymentScrmMapper
      * @return 日统计数据
      * **/
     List<FsStoreScanPaymentStatDetailsVo> getScanPaymentDateStatPage(@Param("dateParam")FsStoreScanPaymentStatParam dateParam);
+
+    /**
+     * 根据用户ID查询是否有支付记录（status=1为已支付）
+     * @param userId 用户ID
+     * @return 支付记录，如果没有则返回null
+     */
+    @Select("select * from fs_store_payment_scrm where user_id = #{userId} and status = 1 limit 1")
+    FsStorePaymentScrm selectPaymentByUserId(@Param("userId") Long userId);
 }

fs-service/src/main/java/com/fs/hisStore/service/IFsStorePaymentScrmService.java

@@ -153,5 +153,11 @@ public interface IFsStorePaymentScrmService
      */
     R auditRefund(Long paymentId, Integer auditStatus, String auditRemark, String auditor);
 
+    /**
+     * 根据用户ID查询支付记录
+     * @param userId 用户ID
+     * @return 支付记录，如果没有则返回null
+     */
+    FsStorePaymentScrm selectPaymentByUserId(Long userId);
 
 }

fs-user-app/src/main/java/com/fs/app/controller/store/UserScrmController.java

@@ -18,10 +18,7 @@ import com.fs.common.param.BaseQueryParam;
 import com.fs.core.config.WxMaConfiguration;
 import com.fs.course.param.newfs.FsUserCourseBeMemberParam;
 import com.fs.course.service.IFsUserCourseVideoService;
-import com.fs.hisStore.domain.FsStoreOrderScrm;
-import com.fs.hisStore.domain.FsUserBillScrm;
-import com.fs.hisStore.domain.FsUserPromoterApplyScrm;
-import com.fs.hisStore.domain.FsUserScrm;
+import com.fs.hisStore.domain.*;
 import com.fs.hisStore.param.*;
 import com.fs.hisStore.service.*;
 import com.fs.hisStore.vo.FsStoreOrderTuiVO;
@@ -74,6 +71,8 @@ public class UserScrmController extends AppBaseController {
     @Autowired
     private IFsStoreOrderScrmService orderService;
     @Autowired
+    private IFsStorePaymentScrmService paymentService;
+    @Autowired
     private IFsUserBillScrmService userBillService;
     @Autowired
     private IFsStoreProductRelationScrmService productRelationService;
@@ -108,8 +107,8 @@ public class UserScrmController extends AppBaseController {
                     user.setIsShow(0);
                 }
             } else if (user.getIsShow() !=null && user.getIsShow() == 0){
-                FsStoreOrderScrm order = orderService.selectOrderByUserIdLimit1(user.getUserId());
-                if (order!=null){
+                FsStorePaymentScrm payment = paymentService.selectPaymentByUserId(user.getUserId());
+                if (payment != null){
                     user.setIsShow(1);
                 }
             }