|
|
@@ -10,12 +10,18 @@ import com.uas.platform.b2c.common.account.model.Enterprise;
|
|
|
import com.uas.platform.b2c.common.account.model.TradeLog;
|
|
|
import com.uas.platform.b2c.common.account.model.User;
|
|
|
import com.uas.platform.b2c.common.base.service.SendMessageService;
|
|
|
+import com.uas.platform.b2c.common.message.model.MessageModel;
|
|
|
+import com.uas.platform.b2c.common.message.type.ConsumerApp;
|
|
|
+import com.uas.platform.b2c.common.message.type.ConsumerType;
|
|
|
+import com.uas.platform.b2c.common.message.type.SMSType;
|
|
|
+import com.uas.platform.b2c.common.psmessage.service.MessageService;
|
|
|
import com.uas.platform.b2c.common.search.rpc.service.OrderSearchService;
|
|
|
import com.uas.platform.b2c.core.config.SysConf;
|
|
|
import com.uas.platform.b2c.core.constant.SplitChar;
|
|
|
import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
import com.uas.platform.b2c.core.support.log.TradeBufferedLogger;
|
|
|
import com.uas.platform.b2c.core.utils.DoubleArith;
|
|
|
+import com.uas.platform.b2c.core.utils.EncryptionFilter;
|
|
|
import com.uas.platform.b2c.core.utils.FastjsonUtils;
|
|
|
import com.uas.platform.b2c.core.utils.NumberUtil;
|
|
|
import com.uas.platform.b2c.fa.payment.dao.BankTransferDao;
|
|
|
@@ -55,11 +61,13 @@ import com.uas.platform.b2c.trade.deprecated.model.OrderRelationInfo;
|
|
|
import com.uas.platform.b2c.trade.deprecated.model.UserInfoForOrder;
|
|
|
import com.uas.platform.b2c.trade.inquiry.dao.TradeChargeDao;
|
|
|
import com.uas.platform.b2c.trade.inquiry.model.TradeCharge;
|
|
|
+import com.uas.platform.b2c.trade.order.StringConstant.StringFormat;
|
|
|
import com.uas.platform.b2c.trade.order.dao.OrderDao;
|
|
|
import com.uas.platform.b2c.trade.order.dao.OrderDetailDao;
|
|
|
import com.uas.platform.b2c.trade.order.dao.OrderIndexDetailDao;
|
|
|
import com.uas.platform.b2c.trade.order.dao.PurchaseDao;
|
|
|
import com.uas.platform.b2c.trade.order.model.*;
|
|
|
+import com.uas.platform.b2c.trade.order.service.MessageNotifyPersonalManagementService;
|
|
|
import com.uas.platform.b2c.trade.order.service.OrderDetailService;
|
|
|
import com.uas.platform.b2c.trade.order.service.OrderService;
|
|
|
import com.uas.platform.b2c.trade.order.service.PurchaseService;
|
|
|
@@ -201,6 +209,13 @@ public class OrderServiceImpl implements OrderService {
|
|
|
@Autowired
|
|
|
private SeekPurchaseService seekPurchaseService;
|
|
|
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private MessageService messageService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private MessageNotifyPersonalManagementService messageNotifyPersonalManagementService;
|
|
|
+
|
|
|
/**
|
|
|
* 保存订单信息
|
|
|
*
|
|
|
@@ -3436,4 +3451,46 @@ public class OrderServiceImpl implements OrderService {
|
|
|
}
|
|
|
return ResultMap.success(bool);
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 用户确认付款,通知管理后台确认收款
|
|
|
+ *
|
|
|
+ * @param order 确认付款的订单
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public void sendConfirmPaidMessage(Order order) {
|
|
|
+ if (order == null || StringUtils.isEmpty(order.getOrderid())) {
|
|
|
+ return ;
|
|
|
+ }
|
|
|
+ List<MessageNotifyPersonalManagement> notifyPersonalManagements = messageNotifyPersonalManagementService.findNotifyPersonalEnuuAndType(sysConf.getEnUU(), com.uas.platform.b2c.trade.order.type.MessageType.CONFIRM_PAID.getType());
|
|
|
+ if (org.apache.commons.collections.CollectionUtils.isNotEmpty(notifyPersonalManagements)) {
|
|
|
+ MessageNotifyPersonalManagement notifyPersonalManagement = notifyPersonalManagements.get(0);
|
|
|
+ String notifyPersonalUseruu = notifyPersonalManagement.getNotifyPersonalUseruu();
|
|
|
+ if (StringUtils.isEmpty(notifyPersonalUseruu)) {
|
|
|
+ return ;
|
|
|
+ }
|
|
|
+ String[] users = notifyPersonalUseruu.split(SplitChar.HYPHEN);
|
|
|
+ List<MessageModel> list = new ArrayList<>();
|
|
|
+ MessageModel model = null;
|
|
|
+ Long useruu = null;
|
|
|
+ for (String user : users) {
|
|
|
+ try {
|
|
|
+ useruu = Long.valueOf(user);
|
|
|
+ } catch (NumberFormatException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (useruu != null) {
|
|
|
+ model = messageService.initMessage(String.format(StringFormat.CONFIRMPAID, EncryptionFilter.encode(order.getOrderid())), com.uas.platform.b2c.trade.order.type.MessageType.CONFIRM_PAID.getType(), useruu, sysConf.getEnUU(), ConsumerType.SINGLE, ConsumerApp.MALL, SMSType.DONT_SEND);
|
|
|
+ if (model != null) {
|
|
|
+ list.add(model);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list)) {
|
|
|
+ messageService.sendMessage(list);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|