Merge remote-tracking branch 'origin/sit' into uat-20260202

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

@@ -183,6 +183,7 @@ public interface StoreInfoMapper extends BaseMapper<StoreInfo> {
             "${ew.customSqlSegment} " +
             "and a.store_position is not null and a.store_position != '' " +
             "and a.head_img_status = 1 " +
+            "and exists (select 1 from contract_bundle cb where cb.subject_type = 'store' and cb.subject_id = a.id and cb.status = '已签署') " +
             "order by distance3 asc")
     List<StoreInfoVo> getMoreRecommendedStores(@Param(Constants.WRAPPER) QueryWrapper<StoreInfoVo> queryWrapper, @Param("position") String position);
 

alien-store/src/main/java/shop/alien/store/strategy/payment/impl/AlipayPartnerPaymentStrategyImpl.java

@@ -65,14 +65,6 @@ public class AlipayPartnerPaymentStrategyImpl implements PaymentStrategy {
         // 【关键】设置二级商户信息（直付通必传）
         model.setSubMerchant(subMerchant);
 
-        SettleInfo settleInfo = new SettleInfo();
-        SettleDetailInfo settleDetailInfo = new SettleDetailInfo();
-        settleDetailInfo.setTransIn("defaultSettle");
-        settleDetailInfo.setAmount(total.toString());
-        List<SettleDetailInfo>  settleDetailInfos = new ArrayList<>();
-        settleDetailInfos.add(settleDetailInfo);
-        settleInfo.setSettleDetailInfos(settleDetailInfos);
-        model.setSettleInfo(settleInfo);
 
         // 设置产品码
 //        model.setProductCode("QUICK_MSECURITY_PAY");