Merge branch 'master' of http://git.izouma.com/xiongzhu/raex_back into dev-meta

src/main/java/com/izouma/nineth/service/DomainOrderService.java

@@ -189,10 +189,10 @@ public class DomainOrderService {
 
     public AtomicBoolean checkPoint(Long userId) {
         AtomicBoolean atomicBoolean = new AtomicBoolean(false);
-        User user = userRepo.findById(userId).orElseThrow(new BusinessException("用户不存在"));
-        if (user.getVipPoint() > 0) {
-            atomicBoolean.set(true);
-        }
+//        User user = userRepo.findById(userId).orElseThrow(new BusinessException("用户不存在"));
+//        if (user.getVipPoint() > 0) {
+//            atomicBoolean.set(true);
+//        }
         return atomicBoolean;
 //        Map<Long, Long> collections = JSONObject.parseObject(sysConfigService
 //                .getString("domain_collection"), new TypeReference<HashMap<Long, Long>>() {

src/main/java/com/izouma/nineth/service/OrderService.java

@@ -833,7 +833,7 @@ public class OrderService {
                             userBalanceService.realtimeSettleOrder(order);
                             if (collection.getType().equals(CollectionType.DOMAIN)) {
                                 NeteaseMessage neteaseMessage = new NeteaseMessage();
-                                neteaseMessage.setFromId("7209");
+                                neteaseMessage.setFromId("56302");
                                 neteaseMessage.setToId("9626109603");
                                 neteaseMessage.setType(0);
                                 neteaseMessage.setOpe(1);
@@ -860,7 +860,7 @@ public class OrderService {
                                         "                                font-weight: bold;" +
                                         "                            \"" +
                                         "                        >" +
-                                        "                            RAEX绿洲：RID元域名称交易监控" +
+                                        "                            RAEX绿洲：RID元域名交易监控" +
                                         "                        </div>" +
                                         "                        <div style=\"display: flex; margin-bottom: 8px\">" +
                                         "                            <img" +