|
@@ -8,9 +8,12 @@ import com.yc.ship.framework.common.pojo.CommonResult;
|
|
|
import com.yc.ship.framework.common.pojo.PageResult;
|
|
import com.yc.ship.framework.common.pojo.PageResult;
|
|
|
import com.yc.ship.framework.common.util.object.BeanUtils;
|
|
import com.yc.ship.framework.common.util.object.BeanUtils;
|
|
|
import com.yc.ship.framework.security.core.LoginUser;
|
|
import com.yc.ship.framework.security.core.LoginUser;
|
|
|
|
|
+import com.yc.ship.framework.security.core.util.SecurityFrameworkUtils;
|
|
|
import com.yc.ship.module.infra.api.config.ConfigApi;
|
|
import com.yc.ship.module.infra.api.config.ConfigApi;
|
|
|
import com.yc.ship.module.ota.api.OtaDistributorApi;
|
|
import com.yc.ship.module.ota.api.OtaDistributorApi;
|
|
|
import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
|
|
import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
|
|
|
|
|
+import com.yc.ship.module.ota.dal.dataobject.distributorcategory.DistributorCategoryDO;
|
|
|
|
|
+import com.yc.ship.module.ota.dal.mysql.distributorcategory.DistributorCategoryMapper;
|
|
|
import com.yc.ship.module.product.api.ProductApi;
|
|
import com.yc.ship.module.product.api.ProductApi;
|
|
|
import com.yc.ship.module.product.api.dto.VoyageRespDTO;
|
|
import com.yc.ship.module.product.api.dto.VoyageRespDTO;
|
|
|
import com.yc.ship.module.product.dal.dataobject.voyagestock.VoyageStockRoomUsedDO;
|
|
import com.yc.ship.module.product.dal.dataobject.voyagestock.VoyageStockRoomUsedDO;
|
|
@@ -20,6 +23,9 @@ import com.yc.ship.module.resource.api.route.RouteApi;
|
|
|
import com.yc.ship.module.resource.api.route.dto.RouteRespDTO;
|
|
import com.yc.ship.module.resource.api.route.dto.RouteRespDTO;
|
|
|
import com.yc.ship.module.resource.api.ship.ShipApi;
|
|
import com.yc.ship.module.resource.api.ship.ShipApi;
|
|
|
import com.yc.ship.module.resource.api.ship.dto.ShipRespDTO;
|
|
import com.yc.ship.module.resource.api.ship.dto.ShipRespDTO;
|
|
|
|
|
+import com.yc.ship.module.system.api.notify.NotifyMessageSendApi;
|
|
|
|
|
+import com.yc.ship.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
|
|
|
|
|
+import com.yc.ship.module.system.api.user.dto.AdminUserRespDTO;
|
|
|
import com.yc.ship.module.trade.api.dto.TradeOrderRespDTO;
|
|
import com.yc.ship.module.trade.api.dto.TradeOrderRespDTO;
|
|
|
import com.yc.ship.module.trade.controller.admin.order.vo.order.*;
|
|
import com.yc.ship.module.trade.controller.admin.order.vo.order.*;
|
|
|
import com.yc.ship.module.trade.controller.admin.orderjzdetail.vo.OrderJzDetailSaveReqVO;
|
|
import com.yc.ship.module.trade.controller.admin.orderjzdetail.vo.OrderJzDetailSaveReqVO;
|
|
@@ -34,6 +40,7 @@ import com.yc.ship.module.trade.dal.mysql.order.TradeVisitorMapper;
|
|
|
import com.yc.ship.module.trade.enums.PayAccountTypeEnum;
|
|
import com.yc.ship.module.trade.enums.PayAccountTypeEnum;
|
|
|
import com.yc.ship.module.trade.enums.SellMethodEnum;
|
|
import com.yc.ship.module.trade.enums.SellMethodEnum;
|
|
|
import com.yc.ship.module.trade.enums.TradeOrderOperateTypeEnum;
|
|
import com.yc.ship.module.trade.enums.TradeOrderOperateTypeEnum;
|
|
|
|
|
+import com.yc.ship.module.trade.enums.TradeOrderStatusEnum;
|
|
|
import com.yc.ship.module.trade.framework.annotation.TradeOrderLog;
|
|
import com.yc.ship.module.trade.framework.annotation.TradeOrderLog;
|
|
|
import com.yc.ship.module.trade.framework.common.TradeOrderLogUtils;
|
|
import com.yc.ship.module.trade.framework.common.TradeOrderLogUtils;
|
|
|
import com.yc.ship.module.trade.framework.mq.TradePublishUtils;
|
|
import com.yc.ship.module.trade.framework.mq.TradePublishUtils;
|
|
@@ -108,7 +115,11 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
|
|
|
@Resource
|
|
@Resource
|
|
|
private VoyageStockRoomUsedMapper voyageStockRoomUsedMapper;
|
|
private VoyageStockRoomUsedMapper voyageStockRoomUsedMapper;
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private NotifyMessageSendApi notifyMessageSendApi;
|
|
|
|
|
+
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private DistributorCategoryMapper distributorCategoryMapper;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -116,10 +127,12 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
|
|
|
public CommonResult<OtcTradeOrderCreateRespVO> miniAppCreateOrder(LoginUser loginUser, MiniTradeOrderCreateReqVO miniTradeOrderCreateReqVO) {
|
|
public CommonResult<OtcTradeOrderCreateRespVO> miniAppCreateOrder(LoginUser loginUser, MiniTradeOrderCreateReqVO miniTradeOrderCreateReqVO) {
|
|
|
TradeOrderOtcCreateVO createVO = BeanUtils.toBean(miniTradeOrderCreateReqVO, TradeOrderOtcCreateVO.class);
|
|
TradeOrderOtcCreateVO createVO = BeanUtils.toBean(miniTradeOrderCreateReqVO, TradeOrderOtcCreateVO.class);
|
|
|
Long distributorId = createVO.getDistributorId();
|
|
Long distributorId = createVO.getDistributorId();
|
|
|
|
|
+ Long otaCategoryId = null;
|
|
|
if (distributorId != null) {
|
|
if (distributorId != null) {
|
|
|
DistributorRespDTO distributor = otaDistributorApi.getDistributorById(distributorId);
|
|
DistributorRespDTO distributor = otaDistributorApi.getDistributorById(distributorId);
|
|
|
if (distributor != null) {
|
|
if (distributor != null) {
|
|
|
createVO.setCustomerName(distributor.getName());
|
|
createVO.setCustomerName(distributor.getName());
|
|
|
|
|
+ otaCategoryId = distributor.getOtaCategoryId();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
VoyageRespDTO voyage = productApi.getVoyage(createVO.getVoyageId());
|
|
VoyageRespDTO voyage = productApi.getVoyage(createVO.getVoyageId());
|
|
@@ -278,6 +291,25 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
|
|
|
tradePublishUtils.publishOrderCreateSuccessMsg(orderId + "");
|
|
tradePublishUtils.publishOrderCreateSuccessMsg(orderId + "");
|
|
|
OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());
|
|
OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());
|
|
|
TradeOrderLogUtils.setOrderInfo(orderId, null, orderStatus, append);
|
|
TradeOrderLogUtils.setOrderInfo(orderId, null, orderStatus, append);
|
|
|
|
|
+ //小程序下单提醒销售
|
|
|
|
|
+ try {
|
|
|
|
|
+ if(otaCategoryId != null){
|
|
|
|
|
+ DistributorCategoryDO distributorCategoryDO = distributorCategoryMapper.selectById(otaCategoryId);
|
|
|
|
|
+ if(distributorCategoryDO != null){
|
|
|
|
|
+ Map map = new HashMap();
|
|
|
|
|
+ map.put("orderNo", orderNo);
|
|
|
|
|
+ NotifySendSingleToUserReqDTO reqDTO = new NotifySendSingleToUserReqDTO();
|
|
|
|
|
+ reqDTO.setTemplateParams(map);
|
|
|
|
|
+ //有新的小程序订单({orderNo})已下单, 请及时查看!
|
|
|
|
|
+ //订单详情页面展示具体变更内容
|
|
|
|
|
+ reqDTO.setTemplateCode("sendmsg_cd_13");
|
|
|
|
|
+ reqDTO.setUserId(Long.valueOf(distributorCategoryDO.getUserId()));
|
|
|
|
|
+ notifyMessageSendApi.sendSingleMessageToAdmin(reqDTO);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ log.error("发送站内信异常", e);
|
|
|
|
|
+ }
|
|
|
return CommonResult.success(respVO);
|
|
return CommonResult.success(respVO);
|
|
|
} finally {
|
|
} finally {
|
|
|
if (lock.isHeldByCurrentThread() && lock.isLocked()) {
|
|
if (lock.isHeldByCurrentThread() && lock.isLocked()) {
|