|
@@ -32,6 +32,8 @@ import cn.newfeifan.mall.module.distri.service.ptprofitlog.PtProfitLogService;
|
|
|
import cn.newfeifan.mall.module.distri.service.sharepath.SharePathService;
|
|
|
import cn.newfeifan.mall.module.member.api.address.MemberAddressApi;
|
|
|
import cn.newfeifan.mall.module.member.api.address.dto.MemberAddressRespDTO;
|
|
|
+import cn.newfeifan.mall.module.member.controller.admin.auth.vo.AppAuthSmsLoginReqVO;
|
|
|
+import cn.newfeifan.mall.module.member.convert.auth.AuthConvert;
|
|
|
import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
|
|
|
import cn.newfeifan.mall.module.member.service.user.MemberUserService;
|
|
|
import cn.newfeifan.mall.module.pay.api.order.PayOrderApi;
|
|
@@ -42,6 +44,8 @@ import cn.newfeifan.mall.module.product.api.comment.ProductCommentApi;
|
|
|
import cn.newfeifan.mall.module.product.api.comment.dto.ProductCommentCreateReqDTO;
|
|
|
import cn.newfeifan.mall.module.product.dal.dataobject.sku.ProductSkuDO;
|
|
|
import cn.newfeifan.mall.module.product.dal.mysql.sku.ProductSkuMapper;
|
|
|
+import cn.newfeifan.mall.module.system.api.sms.SmsCodeApi;
|
|
|
+import cn.newfeifan.mall.module.system.enums.sms.SmsSceneEnum;
|
|
|
import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
|
|
|
import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderRemarkReqVO;
|
|
|
import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderUpdateAddressReqVO;
|
|
@@ -173,6 +177,8 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
|
|
|
private JPushUtils jPushUtils;
|
|
|
@Resource
|
|
|
private MemberUserService memberUserService;
|
|
|
+ @Resource
|
|
|
+ private SmsCodeApi smsCodeApi;
|
|
|
|
|
|
// =================== Order ===================
|
|
|
|
|
@@ -1226,6 +1232,20 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
|
|
|
calc(TradeOrderDOList, orderPercentageDO, JsonUtils.toJsonString(orderPercentageDO));
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public void pickUpInAStore(AppAuthSmsLoginReqVO smsLoginReqVO, Long orderId) {
|
|
|
+ // 校验验证码
|
|
|
+ String userIp = getClientIP();
|
|
|
+ smsCodeApi.useSmsCode(AuthConvert.INSTANCE.convert(smsLoginReqVO, SmsSceneEnum.MEMBER_LOGIN.getScene(), userIp));
|
|
|
+
|
|
|
+ TradeOrderDO updateOrderObj = new TradeOrderDO();
|
|
|
+ updateOrderObj.setId(orderId);
|
|
|
+ updateOrderObj.setStatus(TradeOrderStatusEnum.COMPLETED.getStatus())
|
|
|
+ .setDeliveryTime(LocalDateTime.now())
|
|
|
+ .setReceiveTime(LocalDateTime.now());
|
|
|
+ tradeOrderMapper.updateById(updateOrderObj);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 计算订单支付成功后,订单项的冻结积分转换
|
|
|
*
|