购买会员+paymentId记录

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -216,7 +216,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
             BeanUtils.copyProperties(shotMemberOrderVo, handleMemberOrderVo);
             LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
             LinkedList<Object[]> operationObjs = CollectionUtil.linkedListObjectArr(),
-                    updateMemberOrderObjs = CollectionUtil.linkedListObjectArr(),
+                    initMemberOrderObjs = CollectionUtil.linkedListObjectArr(),
                     initMemberOrderExtObjs = CollectionUtil.linkedListObjectArr();
             LocalDateTime now = LocalDateTime.now();
             if (0 == handleMemberOrderVo.getMode()) {// 购买会员回调
@@ -292,6 +292,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                 });
             }
             handleMemberOrderVo.setPricePaid(parameter.getPrice());
+            handleMemberOrderVo.setPaymentId(parameter.getPaymentId());
             handleMemberOrderVo.setPaymentAt(DateUtil.Formatter.yyyyMMddHHmmss.parse(parameter.getPaymentAt()));
             handleMemberOrderVo.setUpdatedAt(now);
             handleMemberOrderVo.setState(1);// 1-已支付
@@ -304,11 +305,13 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
             log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
             toMqSqls.add(SqlMapping.get("adam_member_order.add"));
-            updateMemberOrderObjs.add(new Object[]{
+            initMemberOrderObjs.add(new Object[]{
                     handleMemberOrderVo.getOrderNo(), handleMemberOrderVo.getUid(), handleMemberOrderVo.getMode(), handleMemberOrderVo.getPrice(),
                     handleMemberOrderVo.getPricePaid(), handleMemberOrderVo.getMemberName(), handleMemberOrderVo.getMemberId(), handleMemberOrderVo.getMemberPriceId(),
                     handleMemberOrderVo.getDays(), handleMemberOrderVo.getState(), handleMemberOrderVo.getMemberNo(), handleMemberOrderVo.getBirthday(),
-                    handleMemberOrderVo.getDeviceFrom(), handleMemberOrderVo.getPayType(), handleMemberOrderVo.getPayNo(), handleMemberOrderVo.getPaymentAt(),
+                    handleMemberOrderVo.getDeviceFrom(), handleMemberOrderVo.getPayType(), handleMemberOrderVo.getPayNo(),
+                    handleMemberOrderVo.getPaymentId(),
+                    handleMemberOrderVo.getPaymentAt(),
                     handleMemberOrderVo.getCreatedAt(),
                     handleMemberOrderVo.getUpdatedAt(),
                     handleMemberOrderVo.getClientIp(), handleMemberOrderVo.getSource(), handleMemberOrderVo.getVersion()
@@ -324,14 +327,14 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                 s = System.currentTimeMillis();
                 queueUtils.sendMsgByRedis(
                         MQConst.AdamQueue.SQL_UMEMBER.getKey(),
-                        SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs, initMemberOrderExtObjs)
+                        SqlMapping.gets(toMqSqls, operationObjs, initMemberOrderObjs, initMemberOrderExtObjs)
                 );
                 log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
             } else {
                 s = System.currentTimeMillis();
                 queueUtils.sendMsgByRedis(
                         MQConst.AdamQueue.SQL_UMEMBER.getKey(),
-                        SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs)
+                        SqlMapping.gets(toMqSqls, operationObjs, initMemberOrderObjs)
                 );
                 log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
             }
@@ -462,7 +465,9 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                     initMemberOrderVo.getOrderNo(), initMemberOrderVo.getUid(), initMemberOrderVo.getMode(), initMemberOrderVo.getPrice(),
                     initMemberOrderVo.getPricePaid(), initMemberOrderVo.getMemberName(), initMemberOrderVo.getMemberId(), initMemberOrderVo.getMemberPriceId(),
                     initMemberOrderVo.getDays(), initMemberOrderVo.getState(), initMemberOrderVo.getMemberNo(), initMemberOrderVo.getBirthday(),
-                    initMemberOrderVo.getDeviceFrom(), initMemberOrderVo.getPayType(), initMemberOrderVo.getPayNo(), initMemberOrderVo.getPaymentAt(),
+                    initMemberOrderVo.getDeviceFrom(), initMemberOrderVo.getPayType(), initMemberOrderVo.getPayNo(),
+                    initMemberOrderVo.getPaymentId(),
+                    initMemberOrderVo.getPaymentAt(),
                     initMemberOrderVo.getCreatedAt(),
                     initMemberOrderVo.getUpdatedAt(),
                     initMemberOrderVo.getClientIp(), initMemberOrderVo.getSource(), initMemberOrderVo.getVersion()

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap.properties

@@ -45,7 +45,7 @@ adam_member_code.add=INSERT INTO adam_member_code (code, `type`, member_id, memb
 adam_member_code.exchange=UPDATE adam_member_code SET `state`=?, updated_at=?, use_order_no=?, use_uid=?, use_at=? WHERE code=? 
 
 # ----------------------------------------------------
-adam_member_order.add=INSERT INTO adam_member_order (order_no, `uid`, `mode`, price, price_paid, member_name, member_id, member_price_id, `days`, `state`, member_no, birthday, device_from, pay_type, pay_no, payment_at, created_at, updated_at, client_ip, `source`, version) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
+adam_member_order.add=INSERT INTO adam_member_order (order_no, `uid`, `mode`, price, price_paid, member_name, member_id, member_price_id, `days`, `state`, member_no, birthday, device_from, pay_type, pay_no, payment_id, payment_at, created_at, updated_at, client_ip, `source`, version) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
 adam_member_order.update=UPDATE adam_member_order SET `state`=?, member_no=?, payment_at=?, updated_at=? WHERE order_no=? 
 
 # ----------------------------------------------------