Merge remote-tracking branch 'origin/main' into main

ship-module-ota/ship-module-ota-api/src/main/java/com/yc/ship/module/ota/api/OtaDistributorApi.java

@@ -2,23 +2,25 @@ package com.yc.ship.module.ota.api;
 
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.module.ota.api.dto.*;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
-import javax.validation.Valid;
-import java.util.Collection;
 import java.util.List;
 
+@Tag(name = "API 服务 - 订单")
 public interface OtaDistributorApi {
     /**
      * 根据登录用户id获取分销商信息
+     *
      * @param loginUserId
      * @return
      */
     DistributorRespDTO getDistributorByLoginUserId(Long loginUserId);
+
     DistributorRespDTO getDistributorById(Long id);
 
     /**
      * 分销商交易充值
+     *
      * @param rechargeReqDTO
      * @return
      */
@@ -47,8 +49,9 @@ public interface OtaDistributorApi {
 
     /**
      * 根据经销商类型获取分销商列表
+     *
      * @param type
      * @return
      */
-    List<DistributorRespDTO> getDistributorList(Integer  type);
+    List<DistributorRespDTO> getDistributorList(Integer type);
 }

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/api/OtaDistributorApiImpl.java

@@ -5,7 +5,6 @@ import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
 import com.yc.ship.module.ota.api.dto.*;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
-import com.yc.ship.module.ota.dal.mysql.distributor.DistributorMapper;
 import com.yc.ship.module.ota.service.distributor.DistributorService;
 import com.yc.ship.module.ota.service.distributorproduct.DistributorProductService;
 import com.yc.ship.module.ota.service.distributorrecharge.DistributorRechargeService;
@@ -15,7 +14,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
 
-import static com.yc.ship.framework.common.pojo.CommonResult.error;
 import static com.yc.ship.framework.common.pojo.CommonResult.success;
 
 @Service
@@ -24,8 +22,6 @@ public class OtaDistributorApiImpl implements OtaDistributorApi{
     @Resource
     private DistributorService distributorService;
 
-    @Resource
-    private DistributorMapper distributorMapper;
     @Resource
     private DistributorProductService distributorProductService;
 
@@ -93,13 +89,7 @@ public class OtaDistributorApiImpl implements OtaDistributorApi{
     @Override
     @TenantIgnore
     public CommonResult<DistributorRespDTO> getDistributorByAccountTenantId(Long accountTenantId) {
-        List<DistributorDO> distributor = distributorMapper.selectList(DistributorDO::getAccountTenantId, accountTenantId);
-        if(distributor!=null && distributor.size()>0){
-            return success(BeanUtils.toBean(distributor.get(0), DistributorRespDTO.class));
-        }else{
-            return error(500,"未查询到分销商信息");
-        }
-
+        return  distributorService.getDistributorByAccountTenantId(accountTenantId);
     }
     @Override
     public CommonResult<?> distributorSelfRecharge(DistributorSelfRechargeReqDTO payNotifyReqDTO) {
@@ -114,7 +104,7 @@ public class OtaDistributorApiImpl implements OtaDistributorApi{
 
     @Override
     public List<DistributorRespDTO> getDistributorList(Integer type) {
-        return BeanUtils.toBean(distributorMapper.selectListByType(type), DistributorRespDTO.class);
+        return BeanUtils.toBean(distributorService.selectListByType(type), DistributorRespDTO.class);
     }
 
 }

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/distributorproduct/DistributorProductController.java

@@ -15,6 +15,7 @@ import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.Pro
 import com.yc.ship.module.ota.dal.dataobject.distributorproduct.DistributorAgencyPriceDO;
 import com.yc.ship.module.ota.dal.dataobject.distributorproduct.DistributorProductDO;
 import com.yc.ship.module.ota.dal.mysql.distributor.DistributorMapper;
+import com.yc.ship.module.ota.service.distributor.DistributorService;
 import com.yc.ship.module.ota.service.distributorproduct.DistributorProductService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -40,7 +41,7 @@ public class DistributorProductController {
     private DistributorProductService distributorProductService;
 
     @Resource
-    private DistributorMapper distributorMapper;
+    private DistributorService distributorService;
 
     @PostMapping("/create")
     @Operation(summary = "创建平台产品与分销商关系")
@@ -89,7 +90,7 @@ public class DistributorProductController {
     public CommonResult<PageResult<DistributorProductRespVO>> pageDistributorProduct(@Valid DistributorProductPageReqVO pageReqVO) {
         ProductPageReqVO vo = new ProductPageReqVO();
         //查询分销商信息
-        DistributorRespVO DistributorVo = distributorMapper.getDistributorById(pageReqVO.getDistributorId());
+        DistributorRespVO DistributorVo = distributorService.getADistributorById(pageReqVO.getDistributorId());
         if(DistributorVo != null){
             vo.setChannelType(DistributorVo.getType());
             vo.setDistributorId(DistributorVo.getId());
@@ -105,7 +106,7 @@ public class DistributorProductController {
     @Operation(summary = "获得产品树及分销商分销产品")
     public CommonResult<List<DistributorProductRespVO>> distributorProductTree(@Valid ProductPageReqVO pageReqVO) {
         //查询分销商信息
-        DistributorRespVO DistributorVo = distributorMapper.getDistributorById(pageReqVO.getDistributorId());
+        DistributorRespVO DistributorVo = distributorService.getADistributorById(pageReqVO.getDistributorId());
         if(DistributorVo != null){
             pageReqVO.setChannelType(DistributorVo.getType());
             pageReqVO.setDistributorId(DistributorVo.getId());

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/distributor/DistributorMapper.java

@@ -44,7 +44,7 @@ public interface DistributorMapper extends BaseMapperX<DistributorDO> {
     }
 
     @TenantIgnore
-    List<StoreRespVO> selectDistributorStore(@Param("tenantId") Long tenantId);
+    List<StoreRespVO> selectDistributorStore(@Param("agencyId") Long agencyId);
     @TenantIgnore
     StoreRespVO selectStore(@Param("id") Long id);
     default List<DistributorDO> getSimpleList(DistributorListReqVO reqVO) {

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributor/DistributorService.java

@@ -90,6 +90,9 @@ public interface DistributorService {
     CommonResult<DistributorRespDTO> getDistributorByAccountTenantId(Long accountTenantId);
 
     List<DistributorRespVO> getOtcDistributor(Integer type);
+
+    List<DistributorDO> selectListByType(Integer type);
+
     List<DistributorRespVO> getOtcDistributor(Integer type, Long productId);
 
     /**
@@ -105,8 +108,7 @@ public interface DistributorService {
 
     CommonResult<DistributorRespDTO> getDistributorByOtaAccount(String otaAccount, String typeCode);
 
-    @TenantIgnore
-    DistributorDO getDistributorById(Long distributorId);
+    DistributorDO getDistributorById(Long id);
 
     DistributorDO getDistributorByLoginUser(String loginName);
 
@@ -128,4 +130,5 @@ public interface DistributorService {
      */
     DistributorDO getDistributorByLoginUserId(Long loginUserId);
 
+    DistributorRespVO getADistributorById(Long id);
 }

ship-module-ota/ship-module-ota-biz/src/main/resources/mapper/distributor/DistributorMapper.xml

@@ -26,6 +26,10 @@
           and type = #{type}
         </if>
     </select>
+    <select id="selectDistributorStore" resultType="com.yc.ship.module.trade.api.dto.StoreRespVO">
+        select * from otc_agency_store where is_use = 1 and deleted=0
+        and agency_id = #{agencyId}
+    </select>
     <select id="getOtcDistributorWithId" resultType="com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorRespVO">
         select d.*, dp.id distributorProductId
         from ota_distributor d

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/controller/admin/otclevel/OtcLevelController.java

@@ -77,6 +77,13 @@ public class OtcLevelController {
         return success(BeanUtils.toBean(level, OtcLevelRespVO.class));
     }
 
+    @GetMapping("/getLevelByTravlId")
+    @Operation(summary = "获得旅行社等级")
+    public CommonResult<OtcLevelRespVO> getLevelByTravlId(@RequestParam("travlId") Long travlId) {
+        OtcLevelDO level = levelService.getLevelByTravlId(travlId);
+        return success(BeanUtils.toBean(level, OtcLevelRespVO.class));
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得旅行社等级管理分页")
     @PreAuthorize("@ss.hasPermission('otc:level:query')")

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/service/otclevel/OtcLevelService.java

@@ -45,6 +45,8 @@ public interface OtcLevelService {
      */
     OtcLevelDO getLevel(Long id);
 
+    OtcLevelDO getLevelByTravlId(Long trvlId);
+
     /**
      * 获得旅行社等级管理分页
      *

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/service/otclevel/OtcLevelServiceImpl.java

@@ -3,6 +3,7 @@ package com.yc.ship.module.otc.service.otclevel;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.yc.ship.module.otc.controller.admin.otclevel.vo.OtcLevelPageReqVO;
 import com.yc.ship.module.otc.controller.admin.otclevel.vo.OtcLevelSaveReqVO;
 import com.yc.ship.module.otc.dal.dataobject.otclevel.OtcLevelDO;
@@ -69,6 +70,15 @@ public class OtcLevelServiceImpl implements OtcLevelService {
         return levelMapper.selectById(id);
     }
 
+    @Override
+    public OtcLevelDO getLevelByTravlId(Long id) {
+        List<OtcLevelDO> levelList = levelMapper.selectList(new LambdaQueryWrapperX<OtcLevelDO>().eq(OtcLevelDO::getId, id));
+        if(levelList!=null && !levelList.isEmpty()){
+            return levelList.get(0);
+        }
+        return null;
+    }
+
     @Override
     public PageResult<OtcLevelDO> getLevelPage(OtcLevelPageReqVO pageReqVO) {
         return levelMapper.selectPage(pageReqVO);

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/distributorDiscount/DistributorDiscountController.java

@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.util.List;
 
 import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static com.yc.ship.framework.common.pojo.CommonResult.error;
 import static com.yc.ship.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 分销商专属折扣")
@@ -65,6 +66,18 @@ public class DistributorDiscountController {
         return success(bean);
     }
 
+    @GetMapping("/getByTravlId")
+    @Operation(summary = "获得分销商专属折扣")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<DistributorDiscountRespVO> getByTravlId(@RequestParam("id") Long id) {
+        DistributorDiscountDO distributorDiscount = distributorDiscountService.getByTravlId(id);
+        if(distributorDiscount==null){
+            return success(null);
+        }
+        DistributorDiscountRespVO bean = BeanUtils.toBean(distributorDiscount, DistributorDiscountRespVO.class);
+        return success(bean);
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得分销商专属折扣分页")
     public CommonResult<PageResult<DistributorDiscountRespVO>> getDistributorDiscountPage(@Valid DistributorDiscountPageReqVO pageReqVO) {

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/distributorDiscount/DistributorDiscountService.java

@@ -43,6 +43,7 @@ public interface DistributorDiscountService {
      * @return 分销商专属折扣
      */
     DistributorDiscountDO getDistributorDiscount(Long id);
+    DistributorDiscountDO getByTravlId(Long id);
 
     /**
      * 获得分销商专属折扣分页

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/distributorDiscount/DistributorDiscountServiceImpl.java

@@ -3,6 +3,9 @@ package com.yc.ship.module.product.service.distributorDiscount;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.yc.ship.module.ota.api.OtaDistributorApi;
+import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
 import com.yc.ship.module.product.controller.admin.distributorDiscount.vo.DistributorDiscountPageReqVO;
 import com.yc.ship.module.product.controller.admin.distributorDiscount.vo.DistributorDiscountSaveReqVO;
 import com.yc.ship.module.product.dal.dataobject.distributorDiscount.DistributorDiscountDO;
@@ -13,6 +16,8 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.util.List;
+
 import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception0;
 
 /**
@@ -27,13 +32,20 @@ public class DistributorDiscountServiceImpl implements DistributorDiscountServic
     @Resource
     private DistributorDiscountMapper distributorDiscountMapper;
 
+    @Resource
+    private OtaDistributorApi otaDistributorApi;
+
     @Override
     public Long createDistributorDiscount(DistributorDiscountSaveReqVO createReqVO) {
         // 插入
+        DistributorRespDTO distributor = otaDistributorApi.getDistributorById(createReqVO.getDistributorId());
         DistributorDiscountDO distributorDiscount = BeanUtils.toBean(createReqVO, DistributorDiscountDO.class);
         distributorDiscount.setId(IdWorker.getId(distributorDiscount));
         distributorDiscount.setAreaId(createReqVO.getAreaId().toString()) ;
+        distributorDiscount.setDistributorName(distributor.getName()) ;
         distributorDiscountMapper.insert(distributorDiscount);
+
+
         // 返回
         return distributorDiscount.getId();
     }
@@ -42,9 +54,11 @@ public class DistributorDiscountServiceImpl implements DistributorDiscountServic
     public void updateDistributorDiscount(DistributorDiscountSaveReqVO updateReqVO) {
         // 校验存在
         validateDistributorDiscountExists(updateReqVO.getId());
+        DistributorRespDTO distributor = otaDistributorApi.getDistributorById(updateReqVO.getDistributorId());
         // 更新
         DistributorDiscountDO updateObj = BeanUtils.toBean(updateReqVO, DistributorDiscountDO.class);
         updateObj.setAreaId(updateReqVO.getAreaId().toString()) ;
+        updateObj.setDistributorName(distributor.getName()) ;
         distributorDiscountMapper.updateById(updateObj);
     }
 
@@ -67,6 +81,15 @@ public class DistributorDiscountServiceImpl implements DistributorDiscountServic
         return distributorDiscountMapper.selectById(id);
     }
 
+    @Override
+    public DistributorDiscountDO getByTravlId(Long id) {
+         List<DistributorDiscountDO> distributorDiscountDOList = distributorDiscountMapper.selectList(new LambdaQueryWrapperX<DistributorDiscountDO>().eq(DistributorDiscountDO::getDistributorId, id));
+        if(distributorDiscountDOList!=null && !distributorDiscountDOList.isEmpty()){
+            return distributorDiscountDOList.get(0);
+        }
+        return null;
+    }
+
     @Override
     public PageResult<DistributorDiscountDO> getDistributorDiscountPage(DistributorDiscountPageReqVO pageReqVO) {
         return distributorDiscountMapper.selectPage(pageReqVO);

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestockdistribute/VoyageStockDistributeServiceImpl.java

@@ -1,38 +1,33 @@
 package com.yc.ship.module.product.service.voyagestockdistribute;
 
+import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.module.ota.api.OtaDistributorApi;
 import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
 import com.yc.ship.module.ota.enums.DistributorTypeEnum;
 import com.yc.ship.module.otc.api.store.StoreApi;
 import com.yc.ship.module.otc.api.store.dto.StoreInfoRespDTO;
-import com.yc.ship.module.otc.api.store.dto.StoreRespDTO;
+import com.yc.ship.module.product.controller.admin.voyagestockdistribute.vo.VoyageStockDistributePageReqVO;
+import com.yc.ship.module.product.controller.admin.voyagestockdistribute.vo.VoyageStockDistributeSaveReqVO;
 import com.yc.ship.module.product.dal.dataobject.voyage.VoyageDO;
 import com.yc.ship.module.product.dal.dataobject.voyagestockdetail.VoyageStockDetailDO;
+import com.yc.ship.module.product.dal.dataobject.voyagestockdistribute.VoyageStockDistributeDO;
 import com.yc.ship.module.product.dal.dataobject.voyagestockdistribute.VoyageStockDistributeLogDO;
 import com.yc.ship.module.product.dal.mysql.voyagestockdistribute.VoyageStockDistributeLogMapper;
-import com.yc.ship.module.product.service.distributorDiscount.DistributorDiscountService;
+import com.yc.ship.module.product.dal.mysql.voyagestockdistribute.VoyageStockDistributeMapper;
 import com.yc.ship.module.product.service.voyage.VoyageService;
 import com.yc.ship.module.product.service.voyagestockdetail.VoyageStockDetailService;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.yc.ship.module.product.controller.admin.voyagestockdistribute.vo.*;
-import com.yc.ship.module.product.dal.dataobject.voyagestockdistribute.VoyageStockDistributeDO;
-import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.framework.common.pojo.PageParam;
-import com.yc.ship.framework.common.util.object.BeanUtils;
-
-import com.yc.ship.module.product.dal.mysql.voyagestockdistribute.VoyageStockDistributeMapper;
-
-import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.yc.ship.module.product.enums.ErrorCodeConstants.*;
-
 /**
  * 航次库存分配 Service 实现类
  *

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

@@ -50,6 +50,9 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
     @NotNull(message = "支付金额不能为空")
     private BigDecimal payAmount;
 
+    @Schema(description = "折扣ID")
+    private Long dicountId;
+
     @Schema(description = "订单联系信息", example = "")
     @NotNull(message = "联系人信息不能为空")
     private OrderUser orderUser;

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

@@ -260,6 +260,9 @@ public class TradeOrderRespVO {
     @Schema(description = "门店ID")
     private Long storeId;
 
+    @Schema(description = "折扣ID")
+    private Long discountId;
+
     @Schema(description = "门店名称")
     @ExcelProperty("门店名称")
     private String storeName;

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

@@ -74,9 +74,15 @@ public class TradeOrderTotalVO {
      */
     @Schema(description = "代收服务费")
     private BigDecimal collectionServiceMoney;
+
+    @Schema(description = "折扣")
+    private Long dicountId;
     /**
      * 订单总额
      */
     @Schema(description = "订单总额")
     private BigDecimal orderMoney;
+
+    @Schema(description = "实际总额")
+    private BigDecimal realOrderMoney;
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/smsSendconfig/vo/SmsSendconfigQueryRespVO.java

@@ -24,6 +24,10 @@ public class SmsSendconfigQueryRespVO {
     @ExcelProperty("航次名称")
     private String voyageName;
 
+    @Schema(description = "航线名称", example = "李四")
+    @ExcelProperty("航线名称")
+    private String routeName;
+
     @Schema(description = "游船名称", example = "李四")
     @ExcelProperty("游船名称")
     private String shipName;
@@ -91,7 +95,6 @@ public class SmsSendconfigQueryRespVO {
     private String sourceName;
     private String contactName;
     private String mobile;
-    private String routeName;
 
 
     private String sellerId;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/order/TradeOrderDO.java

@@ -252,6 +252,10 @@ public class TradeOrderDO extends TenantBaseDO {
      * 游轮ID
      */
     private Long shipId;
+    /**
+     * 折扣ID
+     */
+    private Long discountId;
 
 
     /**

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/bill/BillServiceImpl.java

@@ -228,21 +228,15 @@ public class BillServiceImpl implements BillService {
                 //获取登录租户
                 Long tenantId = TenantContextHolder.getTenantId();
                 //查询是否门店登录
-                LoginUser loginUser = agencyAuthUtils.getLoginUser();
+                LoginUser loginUser = agencyAuthUtils.getAgencyLoginUser();
                 //是否旅行社登录
                 DistributorRespVO distributor = new DistributorRespVO();
-                if(loginUser != null){
-                    distributor = distributorMapper.getById(loginUser.getId());
+                if(loginUser.getDistributorId() != null){
+                    distributor = distributorMapper.getById(loginUser.getDistributorId());
                     billGenerator = 3;
                 }else{
-                    distributor = distributorMapper.getByTenantId(tenantId);
-                    if(distributor == null){
-                        //平台登录
-                        billGenerator = 1;
-                        distributor = distributorMapper.getById(createReqVO.getDistributorId());
-                    } else {
-                        billGenerator = 2;
-                    }
+                    distributor = distributorMapper.getById(createReqVO.getDistributorId());
+                    billGenerator = 1;
                 }
 
                 //判断是否部分生成账单
@@ -664,9 +658,9 @@ public class BillServiceImpl implements BillService {
         IPage<BillRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
         //获取登录租户
         Long tenantId = TenantContextHolder.getTenantId();
-        pageReqVO.setOtaTenantId(tenantId);
+//        pageReqVO.setOtaTenantId(tenantId);
         //查询当前旅行社门店
-        LoginUser loginUser = getLoginUser();
+        LoginUser loginUser = agencyAuthUtils.getAgencyLoginUser();
         Long storeId = loginUser.getStoreId();
         Long distributorId = loginUser.getDistributorId();
         if(storeId == null){
@@ -675,6 +669,7 @@ public class BillServiceImpl implements BillService {
                 DistributorRespVO distributor = distributorMapper.getDistributorById(distributorId);
                 //旅行社
                 if (distributor != null) {
+                    pageReqVO.setAgencyId(distributor.getId());
                     IPage<BillRespVO> iPage = billMapper.getBillPage(page, pageReqVO);
                     return new PageResult<>(iPage.getRecords(), iPage.getTotal());
                 }
@@ -686,6 +681,7 @@ public class BillServiceImpl implements BillService {
         }
         //门店
         else{
+            pageReqVO.setStoreId(storeId);
             IPage<BillRespVO> iPage = billMapper.getBillStorePage(page,pageReqVO);
             return new PageResult<>(iPage.getRecords(), iPage.getTotal());
         }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/billrule/BillRuleServiceImpl.java

@@ -188,19 +188,23 @@ public class BillRuleServiceImpl implements BillRuleService {
     public List<StoreRespVO> selectStoreList(Long distributorId) {
         List<StoreRespVO> storeList = new ArrayList<>();
         //查询当前旅行社门店
-        LoginUser loginUser = agencyAuthUtils.getLoginUser();
-        if(loginUser == null){
+        LoginUser loginUser = agencyAuthUtils.getAgencyLoginUser();
+        if(loginUser.getDistributorId()==null){
             //获取旅行社
             DistributorRespVO distributor = distributorMapper.getById(distributorId);
             if(distributor != null) {
                 //通过租户获取旅行社下面门店
-                storeList = distributorMapper.selectDistributorStore(distributor.getAccountTenantId());
+                storeList = distributorMapper.selectDistributorStore(distributor.getId());
             }
 
         }else{
-            //需要改
-            StoreRespVO store = distributorMapper.selectStore(agencyAuthUtils.getLoginStoreId());
-            storeList.add(store);
+            if(loginUser.getStoreId()!=null) {
+                //需要改
+                StoreRespVO store = distributorMapper.selectStore(loginUser.getStoreId());
+                storeList.add(store);
+            }else{
+                storeList = distributorMapper.selectDistributorStore(loginUser.getDistributorId());
+            }
         }
         return storeList;
     }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -729,6 +729,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         tradeOrderDO.setGroupNo(orderCreateReqDTO.getGroupNo());
         tradeOrderDO.setVoyageId(orderCreateReqDTO.getVoyageId());
         tradeOrderDO.setShipId(orderCreateReqDTO.getShipId());
+        tradeOrderDO.setDiscountId(orderCreateReqDTO.getShipId());
         tradeOrderDO.setCurrency(orderCreateReqDTO.getCurrency());
         //设置团散类型
         if (tradeOrderDO.getVisitorType() == null) {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otawindow/impl/OtaOrderServiceImpl.java

@@ -58,7 +58,7 @@ import static com.yc.ship.module.trade.enums.ApiConstants.REDIS_KEY_TRADE_OTA_IN
 @Slf4j
 public class OtaOrderServiceImpl implements OtaOrderService {
     @Resource
-    DistributorMapper distributorMapper;
+    private DistributorMapper distributorMapper;
     @Resource
     private AdminUserApi adminUserApi;
     @Resource

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -2223,6 +2223,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         shipTradeOrderCreateReqVO.setGroupNo(createVO.getGroupNo());
         shipTradeOrderCreateReqVO.setAmount(createVO.getSummary().getOrderMoney());
         shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getOrderMoney());
+        shipTradeOrderCreateReqVO.setDicountId(createVO.getSummary().getDicountId());
+        if(createVO.getSummary().getRealOrderMoney()!=null) {
+            shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getRealOrderMoney());
+        }
         ShipTradeOrderCreateReqVO.OrderUser orderUser = new ShipTradeOrderCreateReqVO.OrderUser();
         orderUser.setContactName(createVO.getLinkMan());
         orderUser.setMobile(createVO.getLinkMobile());

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/refund/impl/TradeRefundServiceImpl.java

@@ -2,19 +2,13 @@ package com.yc.ship.module.trade.service.refund.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.yc.ship.framework.common.exception.ServiceException;
 import com.yc.ship.framework.common.lang.Asserts;
 import com.yc.ship.framework.common.pojo.CommonResult;
@@ -76,9 +70,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.yc.ship.module.trade.enums.TravelhubDictTypeConstants.NO;
 import static com.yc.ship.module.trade.enums.ApiConstants.*;
 import static com.yc.ship.module.trade.enums.ErrorCodeConstants.*;
+import static com.yc.ship.module.trade.enums.TravelhubDictTypeConstants.NO;
 import static com.yc.ship.module.trade.enums.TravelhubDictTypeConstants.YES;
 import static com.yc.ship.module.trade.service.order.TradeOrderService.UPDATE_ORDER_LOCK;
 

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/bill/BillMapper.xml

@@ -44,10 +44,7 @@
         and td.order_status not in (-1,-2,0,1,6)
         and not exists(select 1 from trade_detail t where t.order_id = td.id and t.voucher_status not in (3,5,6,7,8,9))
         and top.pay_status =1
-        AND (top.payment_type = 6 and top.pay_amount>top.refund_amount
-        and exists(select 1 from trade_order_pay top
-        inner join trade_order_bind tob on tob.order_id  = top.order_id and tob.type =2
-        where tob.bind_id = td.id and top.payment_type = 6 and top.pay_amount>top.refund_amount and top.pay_status =1))
+        AND top.payment_type = 6 and top.pay_amount>top.refund_amount
         <if test="vo.type != null">
             AND td.is_bill =  #{vo.type}
         </if>

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/smsSendconfig/SmsSendconfigMapper.xml

@@ -10,17 +10,19 @@
      -->
     <select id="querySendList" resultType="com.yc.ship.module.trade.controller.admin.smsSendconfig.vo.SmsSendconfigQueryRespVO">
         select * from (
-        select t1.*,t2.product_id,t3.product_name,tt2.short_name,t4.order_no,t3.use_date,count(1)
-        num,t4.source_name,t5.contact_name,t5.mobile,t6.`name` as routeName,t7.api_template_id,t7.params templateParams,t8.api_key,t8.api_secret,t8.api_url,t8.signature,t8.code channelCode from
+        select t1.*,t4.group_no groupNo,t66.name voyageName,t77.name shipName,t67.name routeName ,t2.product_id,t3.product_name,tt2.short_name,t4.order_no,t3.use_date,count(1)
+        num,t4.source_name,t5.contact_name,t5.mobile,t7.api_template_id,t7.params templateParams,t8.api_key,t8.api_secret,t8.api_url,t8.signature,t8.code channelCode from
         system_sms_sendconfig t1
         inner join system_sms_product t2 on t1.id = t2.sms_template_id
         inner join trade_detail t3 on t2.product_id = t3.product_id
         inner join product_spu tt2 on t3.product_id = tt2.id
         inner join trade_order t4 on t3.order_id = t4.id
         inner join trade_order_user t5 on t4.id=t5.order_id
-        left join product_route_plan t6 on t4.route_plan_id = t6.id
-        inner join sanxia_system.system_sms_template t7 on t1.sms_template_id=t7.id
-        inner join sanxia_system.system_sms_channel t8 on t8.id = t7.channel_id
+        inner join product_voyage t66 on t66.id = t4.voyage_id
+        inner join resource_route t67 on t66.route_id = t67.id
+        inner join resource_ship t77 on t77.id = t4.ship_id
+        inner join system_sms_template t7 on t1.sms_template_id=t7.id
+        inner join system_sms_channel t8 on t8.id = t7.channel_id
         where t3.use_date <![CDATA[ >= ]]> DATE_SUB(CURDATE(), INTERVAL 0 DAY) and t3.use_date <![CDATA[ <=]]>
         DATE_SUB(CURDATE(), INTERVAL -1 DAY)
         and t3.voucher_status in (1,2)
@@ -35,52 +37,20 @@
             AND t1.send_type = 2
         </if>
         GROUP BY t1.id,t4.id
-        UNION ALL
-        select t1.*,t2.product_id,t3.product_name,tt2.short_name,t4.order_no,t3.use_date,count
-        (1) num,t4.source_name,t5.contact_name,t5.mobile,t6.`name` as routeName,t7.api_template_id,t7.params templateParams,t8.api_key,t8.api_secret,t8.api_url,t8.signature,t8.code channelCode
-        from system_sms_sendconfig t1
-        inner join system_sms_product t2 on t1.id = t2.sms_template_id
-        inner join trade_order t4 on t2.product_id = t4.route_plan_id
-        inner join trade_detail t3 on t3.order_id = t4.id
-        inner join product_spu tt2 on t3.product_id = tt2.id
-        inner join trade_order_user t5 on t4.id=t5.order_id
-        left join product_route_plan t6 on t4.route_plan_id = t6.id
-        inner join sanxia_system.system_sms_template t7 on t1.sms_template_id=t7.id
-        inner join sanxia_system.system_sms_channel t8 on t8.id = t7.channel_id
-        where t3.use_date <![CDATA[ >= ]]> DATE_SUB(CURDATE(), INTERVAL 0 DAY) and t3.use_date <![CDATA[ <= ]]> DATE_SUB(CURDATE(), INTERVAL -1 DAY)
-        and t3.voucher_status in (1,2)
-        and t1.deleted = 0
-        and t2.deleted = 0
-        and t7.deleted = 0
-        and t1.is_use = 1
-        <if test="id != null">
-            AND t1.id = #{id}
-        </if>
-        <if test="type != null and type == 0">
-            AND t1.send_type = 2
-        </if>
-        GROUP BY t1.id,t4.id
         ) m	where  not EXISTS (
             select p1.order_no from system_sms_send_log p1 where status = 1 and m.order_no=p1.order_no and p1.sms_config_id = m.id
         )
     </select>
 
     <select id="querySendLogList" resultType="com.yc.ship.module.trade.controller.admin.smsSendconfig.vo.SmsSendconfigQueryRespVO">
-        select t1.*,t3.product_id,t3.product_name,tt2.short_name,t3.use_date,count(1)
-        num,t2.source_name,t5.contact_name,t6.`name` as routeName from
+        select t1.*,t2.source_name,t5.contact_name from
         system_sms_send_log t1
         inner join trade_order t2 on t1.order_no = t2.order_no
-        inner join trade_detail t3 on t2.id = t3.order_id
-        inner join product_spu tt2 on t3.product_id = tt2.id
         inner join trade_order_user t5 on t2.id=t5.order_id
-        left join product_route_plan t6 on t2.route_plan_id = t6.id
         where 1=1
         <if test="param.smsConfigId != null">
             AND t1.sms_config_id = #{param.smsConfigId}
         </if>
-        <if test="param.travelDate != null and param.travelDate!=''">
-            AND t3.use_date = #{param.travelDate}
-        </if>
         <if test="param.contact != null and param.contact!=''">
             AND (t5.contact_name = #{param.contact} or t1.mobile = #{param.contact})
         </if>