|
@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
@@ -269,7 +270,7 @@ public class SubmitServiceImpl implements SubmitService {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
+ @Transactional
|
|
private ResponseJson<Map<String, Object>> saveOrder(OrderParamBo orderParamBo) {
|
|
private ResponseJson<Map<String, Object>> saveOrder(OrderParamBo orderParamBo) {
|
|
log.info("******************** 提交订单逻辑处理 start *******************");
|
|
log.info("******************** 提交订单逻辑处理 start *******************");
|
|
/*
|
|
/*
|
|
@@ -1287,18 +1288,8 @@ public class SubmitServiceImpl implements SubmitService {
|
|
log.info("******************** 提交订单逻辑处理 end *******************");
|
|
log.info("******************** 提交订单逻辑处理 end *******************");
|
|
|
|
|
|
/*
|
|
/*
|
|
- * 构造返回参数
|
|
|
|
|
|
+ * 下单推送
|
|
*/
|
|
*/
|
|
- Map<String, Object> info = new HashMap<>();
|
|
|
|
- info.put("orderId", mainOrder.getOrderId());
|
|
|
|
- info.put("orderNo", mainOrder.getOrderNo());
|
|
|
|
- info.put("orderMark", "#" + mainOrder.getOrderId() + "#");
|
|
|
|
- //应付订单金额
|
|
|
|
- info.put("payTotalFee", mainOrder.getPayTotalFee());
|
|
|
|
- //真实需要付款金额
|
|
|
|
- info.put("payableAmount", mainOrder.getPayableAmount());
|
|
|
|
-
|
|
|
|
- //下单推送
|
|
|
|
if (StringUtils.isNotBlank(address.getMobile())) {
|
|
if (StringUtils.isNotBlank(address.getMobile())) {
|
|
String shortLink = messagePushService.getShortLink(8, 3, domain + "/user/mainOrder/detail.html?orderId=" + mainOrder.getOrderId());
|
|
String shortLink = messagePushService.getShortLink(8, 3, domain + "/user/mainOrder/detail.html?orderId=" + mainOrder.getOrderId());
|
|
String name = orderProductList.get(0).getName();
|
|
String name = orderProductList.get(0).getName();
|
|
@@ -1313,6 +1304,17 @@ public class SubmitServiceImpl implements SubmitService {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /*
|
|
|
|
+ * 构造返回参数
|
|
|
|
+ */
|
|
|
|
+ Map<String, Object> info = new HashMap<>();
|
|
|
|
+ info.put("orderId", mainOrder.getOrderId());
|
|
|
|
+ info.put("orderNo", mainOrder.getOrderNo());
|
|
|
|
+ info.put("orderMark", "#" + mainOrder.getOrderId() + "#");
|
|
|
|
+ //应付订单金额
|
|
|
|
+ info.put("payTotalFee", mainOrder.getPayTotalFee());
|
|
|
|
+ //真实需要付款金额
|
|
|
|
+ info.put("payableAmount", mainOrder.getPayableAmount());
|
|
if (isPaySuccessFlag) {
|
|
if (isPaySuccessFlag) {
|
|
// 1提交成功(支付完成)
|
|
// 1提交成功(支付完成)
|
|
return ResponseJson.success(1,"提交成功且已支付完成!", info);
|
|
return ResponseJson.success(1,"提交成功且已支付完成!", info);
|