Merge branch 'bugfix' into dev

This reverts commit b9a556ea30.

src/public/pay.ts

@@ -31,6 +31,8 @@ export class PayFun {
         let obj: payLog = {time: G.time, type: type};
         if (conf.time != -1) obj.eTime = time + conf.time;
 
+        obj.args = payArgs
+
         if (payId == 'G123SendGift') {
             obj.popup_id = payArgs.popup_id
             obj.template_id = payArgs.template_id
@@ -250,7 +252,7 @@ export class PayFun {
             console.log("Christmasfun.payChristmas Error", e);
         }
 
-        if (payArgs && payArgs?.htype) {
+        if (payArgs && payArgs?.htype && payArgs?.selectList) {
             let selectPrize = await G.ioredis.get(`pay:${payId}:${player.uid}`);
             if (selectPrize) {
                 prize.push(...JSON.parse(selectPrize))

src/shared/protocols/pay/PtlGetList.ts

@@ -20,6 +20,11 @@ export type payLog = {
      * @system 系统赠送
      */
     type: 'user' | 'system' | 'legu';
+    /**
+     * 其他信息
+     */
+    args?: any;
+
 
     /** G123 */
     popup_id?: string

src/shared/protocols/serviceProto.ts

@@ -18482,6 +18482,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 },
                 {
                     "id": 3,
+                    "name": "args",
+                    "type": {
+                        "type": "Any"
+                    },
+                    "optional": true
+                },
+                {
+                    "id": 4,
                     "name": "popup_id",
                     "type": {
                         "type": "String"
@@ -18489,7 +18497,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                     "optional": true
                 },
                 {
-                    "id": 4,
+                    "id": 5,
                     "name": "buyNumber",
                     "type": {
                         "type": "Number"
@@ -18497,7 +18505,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                     "optional": true
                 },
                 {
-                    "id": 5,
+                    "id": 6,
                     "name": "template_id",
                     "type": {
                         "type": "String"