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

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/tradelog/TradeLogServiceImpl.java

@@ -130,6 +130,9 @@ public class TradeLogServiceImpl implements TradeLogService {
             if(loginUser!=null && loginUser.getDistributorId()!=null){
                 pageReqVO.setDistributorId(loginUser.getDistributorId());
             }
+            if(loginUser!=null && loginUser.getStoreId()!=null){
+                pageReqVO.setStoreId(loginUser.getStoreId());
+            }
             TenantUtils.executeIgnore(() -> pageResult.set(getTradeLogPageData(pageReqVO)));
             return pageResult.get();
 //        }

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

@@ -46,6 +46,10 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
     @NotNull(message = "订单金额不能为空")
     private BigDecimal amount;
 
+    @Schema(description = "订单附加产品金额（元）", example = "100")
+    @NotNull(message = "订单附加产品金额不能为空")
+    private BigDecimal spuAmount;
+
     @Schema(description = "支付金额（元）", example = "90")
     @NotNull(message = "支付金额不能为空")
     private BigDecimal payAmount;
@@ -102,6 +106,18 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
     @Schema(description = "游轮ID")
     private Long shipId;
 
+    @Schema(description = "是否需要接站服务 0 否 1是")
+    private Integer isJz;
+
+    @Schema(description = "接站地址")
+    private String jzAddress;
+
+    @Schema(description = "接站联系人")
+    private String jzLinkName;
+
+    @Schema(description = "接站联系电话")
+    private String jzLinkPhone;
+
 
     @Schema(description = "国籍数据")
     private List<TradeOrderCountryReqVO> countryData;

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

@@ -43,6 +43,19 @@ public class TradeOrderOtcCreateVO {
     @Schema(description = "是否预订单 0 否 1是")
     private Integer isYd;
 
+    @Schema(description = "是否需要接站服务 0 否 1是")
+    private Integer isJz;
+
+    @Schema(description = "接站地址")
+    private String jzAddress;
+
+    @Schema(description = "接站联系人")
+    private String jzLinkName;
+
+    @Schema(description = "接站联系电话")
+    private String jzLinkPhone;
+
+
     @Schema(description = "国籍数据")
     List<TradeOrderCountryReqVO> countryData;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/orderjz/OrderJzController.java

@@ -0,0 +1,95 @@
+package com.yc.ship.module.trade.controller.admin.orderjz;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.yc.ship.framework.common.pojo.PageParam;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.pojo.CommonResult;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+import static com.yc.ship.framework.common.pojo.CommonResult.success;
+
+import com.yc.ship.framework.excel.core.util.ExcelUtils;
+
+import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
+import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.yc.ship.module.trade.controller.admin.orderjz.vo.*;
+import com.yc.ship.module.trade.dal.dataobject.orderjz.OrderJzDO;
+import com.yc.ship.module.trade.service.orderjz.OrderJzService;
+
+@Tag(name = "管理后台 - 订单接站")
+@RestController
+@RequestMapping("/trade/order-jz")
+@Validated
+public class OrderJzController {
+
+    @Resource
+    private OrderJzService orderJzService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建订单接站")
+    @PreAuthorize("@ss.hasPermission('trade:order-jz:create')")
+    public CommonResult<Long> createOrderJz(@Valid @RequestBody OrderJzSaveReqVO createReqVO) {
+        return success(orderJzService.createOrderJz(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新订单接站")
+    @PreAuthorize("@ss.hasPermission('trade:order-jz:update')")
+    public CommonResult<Boolean> updateOrderJz(@Valid @RequestBody OrderJzSaveReqVO updateReqVO) {
+        orderJzService.updateOrderJz(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除订单接站")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('trade:order-jz:delete')")
+    public CommonResult<Boolean> deleteOrderJz(@RequestParam("id") Long id) {
+        orderJzService.deleteOrderJz(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得订单接站")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('trade:order-jz:query')")
+    public CommonResult<OrderJzRespVO> getOrderJz(@RequestParam("id") Long id) {
+        OrderJzDO orderJz = orderJzService.getOrderJz(id);
+        return success(BeanUtils.toBean(orderJz, OrderJzRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得订单接站分页")
+    @PreAuthorize("@ss.hasPermission('trade:order-jz:query')")
+    public CommonResult<PageResult<OrderJzRespVO>> getOrderJzPage(@Valid OrderJzPageReqVO pageReqVO) {
+        PageResult<OrderJzDO> pageResult = orderJzService.getOrderJzPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, OrderJzRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出订单接站 Excel")
+    @PreAuthorize("@ss.hasPermission('trade:order-jz:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportOrderJzExcel(@Valid OrderJzPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<OrderJzDO> list = orderJzService.getOrderJzPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "订单接站.xls", "数据", OrderJzRespVO.class,
+                        BeanUtils.toBean(list, OrderJzRespVO.class));
+    }
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/orderjz/vo/OrderJzPageReqVO.java

@@ -0,0 +1,29 @@
+package com.yc.ship.module.trade.controller.admin.orderjz.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.yc.ship.framework.common.pojo.PageParam;
+
+@Schema(description = "管理后台 - 订单接站分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class OrderJzPageReqVO extends PageParam {
+
+    @Schema(description = "订单号", example = "4066")
+    private Long orderId;
+
+    @Schema(description = "是否需要接站服务 0 否 1是")
+    private Integer isJz;
+
+    @Schema(description = "接站地址")
+    private String jzAddress;
+
+    @Schema(description = "接站联系人", example = "芋艿")
+    private String jzLinkName;
+
+    @Schema(description = "接站联系电话")
+    private String jzLinkPhone;
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/orderjz/vo/OrderJzRespVO.java

@@ -0,0 +1,37 @@
+package com.yc.ship.module.trade.controller.admin.orderjz.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 订单接站 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class OrderJzRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2061")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "4066")
+    @ExcelProperty("订单号")
+    private Long orderId;
+
+    @Schema(description = "是否需要接站服务 0 否 1是")
+    @ExcelProperty("是否需要接站服务 0 否 1是")
+    private Integer isJz;
+
+    @Schema(description = "接站地址")
+    @ExcelProperty("接站地址")
+    private String jzAddress;
+
+    @Schema(description = "接站联系人", example = "芋艿")
+    @ExcelProperty("接站联系人")
+    private String jzLinkName;
+
+    @Schema(description = "接站联系电话")
+    @ExcelProperty("接站联系电话")
+    private String jzLinkPhone;
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/orderjz/vo/OrderJzSaveReqVO.java

@@ -0,0 +1,31 @@
+package com.yc.ship.module.trade.controller.admin.orderjz.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 订单接站新增/修改 Request VO")
+@Data
+public class OrderJzSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2061")
+    private Long id;
+
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "4066")
+    @NotNull(message = "订单号不能为空")
+    private Long orderId;
+
+    @Schema(description = "是否需要接站服务 0 否 1是")
+    private Integer isJz;
+
+    @Schema(description = "接站地址")
+    private String jzAddress;
+
+    @Schema(description = "接站联系人", example = "芋艿")
+    private String jzLinkName;
+
+    @Schema(description = "接站联系电话")
+    private String jzLinkPhone;
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/orderjz/OrderJzDO.java

@@ -0,0 +1,48 @@
+package com.yc.ship.module.trade.dal.dataobject.orderjz;
+
+import lombok.*;
+import java.util.*;
+import com.baomidou.mybatisplus.annotation.*;
+import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 订单接站 DO
+ *
+ * @author lsq
+ */
+@TableName("trade_order_jz")
+@KeySequence("trade_order_jz_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderJzDO {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * 订单号
+     */
+    private Long orderId;
+    /**
+     * 是否需要接站服务 0 否 1是
+     */
+    private Integer isJz;
+    /**
+     * 接站地址
+     */
+    private String jzAddress;
+    /**
+     * 接站联系人
+     */
+    private String jzLinkName;
+    /**
+     * 接站联系电话
+     */
+    private String jzLinkPhone;
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/orderjz/OrderJzMapper.java

@@ -0,0 +1,28 @@
+package com.yc.ship.module.trade.dal.mysql.orderjz;
+
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
+import com.yc.ship.module.trade.controller.admin.orderjz.vo.OrderJzPageReqVO;
+import com.yc.ship.module.trade.dal.dataobject.orderjz.OrderJzDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 订单接站 Mapper
+ *
+ * @author lsq
+ */
+@Mapper
+public interface OrderJzMapper extends BaseMapperX<OrderJzDO> {
+
+    default PageResult<OrderJzDO> selectPage(OrderJzPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<OrderJzDO>()
+                .eqIfPresent(OrderJzDO::getOrderId, reqVO.getOrderId())
+                .eqIfPresent(OrderJzDO::getIsJz, reqVO.getIsJz())
+                .eqIfPresent(OrderJzDO::getJzAddress, reqVO.getJzAddress())
+                .likeIfPresent(OrderJzDO::getJzLinkName, reqVO.getJzLinkName())
+                .eqIfPresent(OrderJzDO::getJzLinkPhone, reqVO.getJzLinkPhone())
+                .orderByDesc(OrderJzDO::getId));
+    }
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/job/OrderSmsJob.java

@@ -0,0 +1,15 @@
+package com.yc.ship.module.trade.job;
+
+import com.yc.ship.framework.quartz.core.handler.JobHandler;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OrderSmsJob implements JobHandler {
+
+
+    @Override
+    public String execute(String param) {
+        return "成功";
+    }
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/bo/TradeOrderBO.java

@@ -3,6 +3,7 @@ package com.yc.ship.module.trade.service.order.bo;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDeliveryDO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderUserDO;
+import com.yc.ship.module.trade.dal.dataobject.orderjz.OrderJzDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -22,6 +23,7 @@ public class TradeOrderBO {
     private List<TradeOrderDetailBO>  tradeOrderDetailBOList;
     private TradeOrderDeliveryDO tradeOrderDeliveryDO;
     private ExtraInfo extraInfo;
+    private OrderJzDO orderJzDO;
 
     @Data
     public static class ExtraInfo{

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

@@ -30,9 +30,11 @@ import com.yc.ship.module.trade.controller.app.pda.vo.PdaQueryOrderReqVO;
 import com.yc.ship.module.trade.controller.app.pda.vo.PdaQueryVoucherReqVO;
 import com.yc.ship.module.trade.controller.app.pda.vo.SupplierCheckOrderPageVO;
 import com.yc.ship.module.trade.dal.dataobject.order.*;
+import com.yc.ship.module.trade.dal.dataobject.orderjz.OrderJzDO;
 import com.yc.ship.module.trade.dal.mysql.contract.ContractMapper;
 import com.yc.ship.module.trade.dal.mysql.insurance.InsuranceMapper;
 import com.yc.ship.module.trade.dal.mysql.order.*;
+import com.yc.ship.module.trade.dal.mysql.orderjz.OrderJzMapper;
 import com.yc.ship.module.trade.enums.*;
 import com.yc.ship.module.trade.service.order.TradeOrderRepositoryService;
 import com.yc.ship.module.trade.service.order.bo.*;
@@ -67,6 +69,8 @@ public class TradeOrderRepositoryServiceImpl implements TradeOrderRepositoryServ
     @Resource
     private TradeOrderMapper tradeOrderMapper;
     @Resource
+    private OrderJzMapper orderJzMapper;
+    @Resource
     private TradeDetailMapper tradeDetailMapper;
     @Resource
     private TradeDetailBaseMapper tradeDetailBaseMapper;
@@ -112,6 +116,7 @@ public class TradeOrderRepositoryServiceImpl implements TradeOrderRepositoryServ
         try {
 
             tradeOrderMapper.insert(tradeOrderBO.getTradeOrderDO());
+            orderJzMapper.insert(tradeOrderBO.getOrderJzDO());
             tradeOrderUserMapper.insert(tradeOrderBO.getTradeOrderUserDO());
 
             if(tradeOrderBO.getTradeOrderDeliveryDO() !=null) {

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

@@ -34,6 +34,7 @@ import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderPageRe
 import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRespVO;
 import com.yc.ship.module.trade.convert.order.TradeOrderConvert;
 import com.yc.ship.module.trade.dal.dataobject.order.*;
+import com.yc.ship.module.trade.dal.dataobject.orderjz.OrderJzDO;
 import com.yc.ship.module.trade.dal.mysql.order.TradeDetailBaseMapper;
 import com.yc.ship.module.trade.dal.mysql.order.TradeDetailMapper;
 import com.yc.ship.module.trade.dal.mysql.order.TradeOrderMapper;
@@ -750,6 +751,15 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         if(orderCreateReqDTO.getIsYd()!=null && orderCreateReqDTO.getIsYd() == 1){
             tradeOrderDO.setOrderStatus(TradeOrderStatusEnum.YD.getStatus());
         }
+        OrderJzDO orderJzDO = new OrderJzDO();
+        orderJzDO.setId(IdWorker.getId());
+        orderJzDO.setOrderId(tradeOrderDO.getId());
+        orderJzDO.setIsJz(orderCreateReqDTO.getIsJz());
+        orderJzDO.setJzAddress(orderCreateReqDTO.getJzAddress());
+        orderJzDO.setJzLinkName(orderCreateReqDTO.getJzLinkName());
+        orderJzDO.setJzLinkPhone(orderCreateReqDTO.getJzLinkPhone());
+        tradeOrderBO.setOrderJzDO(orderJzDO);
+
         //订单联系人
         TradeOrderUserDO tradeOrderUserDO = new TradeOrderUserDO();
         tradeOrderUserDO.setId(IdWorker.getId());

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/orderjz/OrderJzService.java

@@ -0,0 +1,55 @@
+package com.yc.ship.module.trade.service.orderjz;
+
+import java.util.*;
+import javax.validation.*;
+import com.yc.ship.module.trade.controller.admin.orderjz.vo.*;
+import com.yc.ship.module.trade.dal.dataobject.orderjz.OrderJzDO;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.pojo.PageParam;
+
+/**
+ * 订单接站 Service 接口
+ *
+ * @author lsq
+ */
+public interface OrderJzService {
+
+    /**
+     * 创建订单接站
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createOrderJz(@Valid OrderJzSaveReqVO createReqVO);
+
+    /**
+     * 更新订单接站
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateOrderJz(@Valid OrderJzSaveReqVO updateReqVO);
+
+    /**
+     * 删除订单接站
+     *
+     * @param id 编号
+     */
+    void deleteOrderJz(Long id);
+
+    /**
+     * 获得订单接站
+     *
+     * @param id 编号
+     * @return 订单接站
+     */
+    OrderJzDO getOrderJz(Long id);
+
+    /**
+     * 获得订单接站分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 订单接站分页
+     */
+    PageResult<OrderJzDO> getOrderJzPage(OrderJzPageReqVO pageReqVO);
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/orderjz/OrderJzServiceImpl.java

@@ -0,0 +1,74 @@
+package com.yc.ship.module.trade.service.orderjz;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import com.yc.ship.module.trade.controller.admin.orderjz.vo.*;
+import com.yc.ship.module.trade.dal.dataobject.orderjz.OrderJzDO;
+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.trade.dal.mysql.orderjz.OrderJzMapper;
+
+import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.yc.ship.module.trade.enums.ErrorCodeConstants.*;
+
+/**
+ * 订单接站 Service 实现类
+ *
+ * @author lsq
+ */
+@Service
+@Validated
+public class OrderJzServiceImpl implements OrderJzService {
+
+    @Resource
+    private OrderJzMapper orderJzMapper;
+
+    @Override
+    public Long createOrderJz(OrderJzSaveReqVO createReqVO) {
+        // 插入
+        OrderJzDO orderJz = BeanUtils.toBean(createReqVO, OrderJzDO.class);
+        orderJzMapper.insert(orderJz);
+        // 返回
+        return orderJz.getId();
+    }
+
+    @Override
+    public void updateOrderJz(OrderJzSaveReqVO updateReqVO) {
+        // 校验存在
+        validateOrderJzExists(updateReqVO.getId());
+        // 更新
+        OrderJzDO updateObj = BeanUtils.toBean(updateReqVO, OrderJzDO.class);
+        orderJzMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteOrderJz(Long id) {
+        // 校验存在
+        validateOrderJzExists(id);
+        // 删除
+        orderJzMapper.deleteById(id);
+    }
+
+    private void validateOrderJzExists(Long id) {
+        if (orderJzMapper.selectById(id) == null) {
+            throw exception(500,"不存在");
+        }
+    }
+
+    @Override
+    public OrderJzDO getOrderJz(Long id) {
+        return orderJzMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<OrderJzDO> getOrderJzPage(OrderJzPageReqVO pageReqVO) {
+        return orderJzMapper.selectPage(pageReqVO);
+    }
+
+}

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

@@ -2265,18 +2265,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         }
         orderDetail.setVisitorList(visitorList);
         orderDetail.setCount(visitorList.size());
-        if(createVO.getSummary().getOrderMoney()!=null && createVO.getSummary().getOrderMoney().compareTo(new BigDecimal(0))>0) {
-            BigDecimal price = createVO.getSummary().getOrderMoney().divide(new BigDecimal(visitorList.size()), 2, RoundingMode.HALF_UP);
-            orderDetail.setPrice(price);
-            orderDetail.setOriginPrice(price);
-        }else{
-            BigDecimal price = new BigDecimal(0);
-            orderDetail.setPrice(price);
-            orderDetail.setOriginPrice(price);
-        }
-
-        orderDetail.setProductType(0);
-        detailList.add(orderDetail);
 
         BigDecimal spuMoney = new BigDecimal(0);
         for (TradeSpuReqVO tradeSpuReqVO : createVO.getSpuList()) {
@@ -2301,13 +2289,29 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             orderDetail1.setCount(visitorList1.size());
             detailList.add(orderDetail1);
         }
+
+
+        if(createVO.getSummary().getOrderMoney()!=null && createVO.getSummary().getOrderMoney().compareTo(new BigDecimal(0))>0) {
+            BigDecimal price = createVO.getSummary().getOrderMoney().subtract(spuMoney).divide(new BigDecimal(visitorList.size()), 2, RoundingMode.HALF_UP);
+            orderDetail.setPrice(price);
+            orderDetail.setOriginPrice(price);
+        }else{
+            BigDecimal price = new BigDecimal(0);
+            orderDetail.setPrice(price);
+            orderDetail.setOriginPrice(price);
+        }
+
+        orderDetail.setProductType(0);
+        detailList.add(orderDetail);
+
+
         orderItem.setDetailList(detailList);
 
         shipTradeOrderCreateReqVO.setItemlList(Arrays.asList(orderItem));
 
-        BigDecimal totalAmount = spuMoney.add(createVO.getSummary().getOrderMoney());
-        shipTradeOrderCreateReqVO.setAmount(totalAmount);
-        shipTradeOrderCreateReqVO.setPayAmount(totalAmount);
+//        BigDecimal totalAmount = spuMoney.add(createVO.getSummary().getOrderMoney());
+        shipTradeOrderCreateReqVO.setSpuAmount(spuMoney);
+//        shipTradeOrderCreateReqVO.setPayAmount(totalAmount);
 
         CommonResult<TradeOrderRespDTO> result = doShipCreateOrder(loginUser,shipTradeOrderCreateReqVO,SellMethodEnum.WINDOW);
         if (result.isError()) {

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/orderjz/OrderJzMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yc.ship.module.trade.dal.mysql.orderjz.OrderJzMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

ship-server-web/src/main/resources/application.yaml

@@ -291,6 +291,7 @@ yudao:
       - /travl-app-api/trade/orderTest # 基于名字获取租户，不许带租户编号
       - /travl-app-api/trade/payNotify
       - /travl-app-api/trade/refundNotify
+      - /travl-app-api/system/sms/callback/aliyun
     ignore-visit-urls:
       - /admin-api/system/user/profile/**
     ignore-tables:
@@ -315,6 +316,7 @@ yudao:
       - system_area
       - system_area_country
       - trade_mch_info
+      - trade_order_jz
     ignore-caches:
       - user_role_ids
       - permission_menu_ids