fix: 修改政策接口

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/policy/PolicyServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yc.ship.module.marketing.service.policy;
 
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.ip.core.utils.AreaUtils;
 import com.yc.ship.module.marketing.dal.dataobject.policydetail.PolicyDetailDO;
 import com.yc.ship.module.marketing.dal.mysql.policydetail.PolicyDetailMapper;
 import com.yc.ship.module.product.dal.dataobject.voyage.VoyageDO;
@@ -60,10 +61,10 @@ public class PolicyServiceImpl implements PolicyService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updatePolicy(PolicySaveReqVO updateReqVO) {
-        throw exception0(500, "暂不支持修改");
+//        throw exception0(500, "暂不支持修改");
         // 更新
-//        PolicyDO updateObj = BeanUtils.toBean(updateReqVO, PolicyDO.class);
-//        policyMapper.updateById(updateObj);
+        PolicyDO updateObj = BeanUtils.toBean(updateReqVO, PolicyDO.class);
+        policyMapper.updateById(updateObj);
 //        handlePolicyDetail(updateObj.getId(), updateReqVO);
     }
 
@@ -168,6 +169,9 @@ public class PolicyServiceImpl implements PolicyService {
             PolicyDetailDO policyDetailDO = policyDetailDOMap.get(policyRespVO.getId());
             if(policyDetailDO != null) {
                 policyRespVO.setAreaIds(policyDetailDO.getAreaIds());
+                List<AreaCountryDTO> areaCountryListByAreaIds = areaApi.getAreaCountryListByAreaIds(policyDetailDO.getAreaIds());
+                List<Integer> countryIds = CollectionUtils.convertList(areaCountryListByAreaIds, AreaCountryDTO::getCountryId);
+                policyRespVO.setCountryIds(countryIds);
                 policyRespVO.setRoomModelIds(policyDetailDO.getRoomModelIds());
                 policyRespVO.setSurplusNum(policyDetailDO.getSurplusNum());
             }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -312,7 +312,7 @@ public class OtcTradeOrderController {
                     item.setTotalPerson(0);
                 }
 
-                if(item.getRoomModelList()!=null && item.getRoomModelList().isEmpty()) {
+                if(item.getRoomModelList()!=null && !item.getRoomModelList().isEmpty()) {
                     Map<String, List<TradeOrderRoomModelVO>> roomDesc = item.getRoomModelList().stream().collect(Collectors.groupingBy(p -> p.getRoomModelName() + "(" + p.getFloor() + "F)"));
                     AtomicReference<String> roomDescStr = new AtomicReference<>("");
                     roomDesc.forEach((key, value) -> roomDescStr.set(roomDescStr.get() + " " + value.size() + "*" + key));