From 59aa47f07ac2c6b6845e0b387fa33e5fb2e30f22 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 17 Aug 2020 15:05:09 +0800 Subject: [PATCH] fix contract --- mallinkAdmin/hs_err_pid12036.log | 447 ++++++++++++++++++ .../basic/WxMerchantController.java | 3 +- .../impl/WxRentContractServiceImpl.java | 28 +- .../resources/mapper/WxRentContractMapper.xml | 2 +- 4 files changed, 464 insertions(+), 16 deletions(-) create mode 100644 mallinkAdmin/hs_err_pid12036.log diff --git a/mallinkAdmin/hs_err_pid12036.log b/mallinkAdmin/hs_err_pid12036.log new file mode 100644 index 000000000..a72b0ab19 --- /dev/null +++ b/mallinkAdmin/hs_err_pid12036.log @@ -0,0 +1,447 @@ +# +# A fatal error has been detected by the Java Runtime Environment: +# +# EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x0000000073ea8225, pid=12036, tid=16124 +# +# JRE version: Java(TM) SE Runtime Environment (8.0_40-b25) (build 1.8.0_40-b25) +# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.40-b25 mixed mode windows-amd64 compressed oops) +# Problematic frame: +# V [jvm.dll+0x128225] +# +# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows +# +# If you would like to submit a bug report, please visit: +# http://bugreport.java.com/bugreport/crash.jsp +# + +--------------- T H R E A D --------------- + +Current thread (0x000000001a6b6000): JavaThread "JDWP Transport Listener: dt_socket" daemon [_thread_in_vm, id=16124, stack(0x000000001ac10000,0x000000001ad10000)] + +siginfo: ExceptionCode=0xc0000005, reading address 0x000000000000009b + +Registers: +RAX=0x000000001ad0f301, RBX=0x000000001a6b6000, RCX=0x000000000000009b, RDX=0x0000000000000000 +RSP=0x000000001ad0f2e0, RBP=0x000000000000009b, RSI=0x000000001ad0f3f8, RDI=0x0000000003668570 +R8 =0x000000001a6b6000, R9 =0x0000000000000001, R10=0x0000000000008000, R11=0x000000001ad0f230 +R12=0x0000000000000000, R13=0x000000001a6be518, R14=0x0000000000000000, R15=0x0000000000000000 +RIP=0x0000000073ea8225, EFLAGS=0x0000000000010202 + +Top of Stack: (sp=0x000000001ad0f2e0) +0x000000001ad0f2e0: 000000001a6b6000 000000001a6b6000 +0x000000001ad0f2f0: 000000001ad0f3a8 00000000740ac6db +0x000000001ad0f300: 000000001a6b6000 00000000740c8f3d +0x000000001ad0f310: 0000000000000000 00000000748d9155 +0x000000001ad0f320: 000000001eb5faf0 00000000748e291e +0x000000001ad0f330: 000000001a6b6000 0000000000000000 +0x000000001ad0f340: 0000000000000000 0000000000000000 +0x000000001ad0f350: 000000000000009b 00000000748e1a15 +0x000000001ad0f360: 000000001ad0f3f8 000000001ad0f3d0 +0x000000001ad0f370: 0000000000000001 000000001eb5faf0 +0x000000001ad0f380: 000000000000009b 00000000748c53b3 +0x000000001ad0f390: 000000001ad0f4c0 0000000000000001 +0x000000001ad0f3a0: 0000000000000001 000000001eb5faf0 +0x000000001ad0f3b0: 0000000000000001 0000000000000000 +0x000000001ad0f3c0: 0000000000000000 0000000000000000 +0x000000001ad0f3d0: 0000000000000001 00000000748c5571 + +Instructions: (pc=0x0000000073ea8225) +0x0000000073ea8205: cc cc cc cc cc cc cc cc cc cc cc 48 83 ec 28 48 +0x0000000073ea8215: 85 c9 75 07 33 c0 48 83 c4 28 c3 48 89 5c 24 20 +0x0000000073ea8225: 48 8b 19 48 85 db 74 20 48 83 fb 37 74 1a 48 8b +0x0000000073ea8235: 13 48 8b cb ff 52 10 84 c0 74 0d 48 8b c3 48 8b + + +Register to memory mapping: + +RAX=0x000000001ad0f301 is pointing into the stack for thread: 0x000000001a6b6000 +RBX=0x000000001a6b6000 is a thread +RCX=0x000000000000009b is an unknown value +RDX=0x0000000000000000 is an unknown value +RSP=0x000000001ad0f2e0 is pointing into the stack for thread: 0x000000001a6b6000 +RBP=0x000000000000009b is an unknown value +RSI=0x000000001ad0f3f8 is pointing into the stack for thread: 0x000000001a6b6000 +RDI=0x0000000003668570 is an unknown value +R8 =0x000000001a6b6000 is a thread +R9 =0x0000000000000001 is an unknown value +R10=0x0000000000008000 is an unknown value +R11=0x000000001ad0f230 is pointing into the stack for thread: 0x000000001a6b6000 +R12=0x0000000000000000 is an unknown value +R13=0x000000001a6be518 is an unknown value +R14=0x0000000000000000 is an unknown value +R15=0x0000000000000000 is an unknown value + + +Stack: [0x000000001ac10000,0x000000001ad10000], sp=0x000000001ad0f2e0, free space=1020k +Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) +V [jvm.dll+0x128225] +V [jvm.dll+0x348f3d] +C [jdwp.dll+0x21a15] +C [jdwp.dll+0x53b3] +C [jdwp.dll+0x5571] +C [jdwp.dll+0xf0a8] +C [jdwp.dll+0x1f2d5] +C [jdwp.dll+0x1f4aa] +V [jvm.dll+0x1bad48] +V [jvm.dll+0x241914] +V [jvm.dll+0x29848a] +C [msvcr100.dll+0x21d9f] +C [msvcr100.dll+0x21e3b] +C [KERNEL32.DLL+0x17bd4] +C [ntdll.dll+0x6ce51] + + +--------------- P R O C E S S --------------- + +Java Threads: ( => current thread ) + 0x0000000020d0b000 JavaThread "lettuce-eventExecutorLoop-1-7" daemon [_thread_blocked, id=1316, stack(0x00000000313f0000,0x00000000314f0000)] + 0x0000000020d0c800 JavaThread "XNIO-1 task-5" [_thread_blocked, id=1152, stack(0x0000000028a60000,0x0000000028b60000)] + 0x0000000020d08800 JavaThread "lettuce-eventExecutorLoop-1-6" daemon [_thread_blocked, id=8320, stack(0x00000000312f0000,0x00000000313f0000)] + 0x0000000020d08000 JavaThread "XNIO-1 task-4" [_thread_blocked, id=10324, stack(0x00000000311f0000,0x00000000312f0000)] + 0x0000000020d04000 JavaThread "lettuce-eventExecutorLoop-1-5" daemon [_thread_blocked, id=6848, stack(0x00000000310f0000,0x00000000311f0000)] + 0x0000000020d02800 JavaThread "XNIO-1 task-3" [_thread_blocked, id=9060, stack(0x0000000030ff0000,0x00000000310f0000)] + 0x0000000020d02000 JavaThread "lettuce-eventExecutorLoop-1-4" daemon [_thread_blocked, id=15328, stack(0x0000000030ef0000,0x0000000030ff0000)] + 0x0000000020cfe800 JavaThread "XNIO-1 task-2" [_thread_blocked, id=15688, stack(0x0000000030df0000,0x0000000030ef0000)] + 0x0000000020d01000 JavaThread "lettuce-eventExecutorLoop-1-3" daemon [_thread_blocked, id=11512, stack(0x0000000030af0000,0x0000000030bf0000)] + 0x0000000020d00000 JavaThread "lettuce-eventExecutorLoop-1-2" daemon [_thread_blocked, id=11368, stack(0x00000000309f0000,0x0000000030af0000)] + 0x0000000020d05800 JavaThread "lettuce-eventExecutorLoop-1-1" daemon [_thread_blocked, id=6732, stack(0x000000002ddf0000,0x000000002def0000)] + 0x0000000020cfe000 JavaThread "lettuce-nioEventLoop-4-1" daemon [_thread_in_native, id=10212, stack(0x000000002b890000,0x000000002b990000)] + 0x0000000020cff800 JavaThread "SessionValidationThread-1" daemon [_thread_blocked, id=13544, stack(0x0000000001790000,0x0000000001890000)] + 0x0000000020d05000 JavaThread "XNIO-1 task-1" [_thread_blocked, id=12528, stack(0x0000000001690000,0x0000000001790000)] + 0x0000000020d03800 JavaThread "DestroyJavaVM" [_thread_blocked, id=16312, stack(0x0000000003540000,0x0000000003640000)] + 0x00000000200bd000 JavaThread "XNIO-1 Accept" [_thread_in_native, id=12964, stack(0x000000002f220000,0x000000002f320000)] + 0x00000000200bc000 JavaThread "XNIO-1 I/O-8" [_thread_in_native, id=2240, stack(0x000000002f120000,0x000000002f220000)] + 0x00000000200ba800 JavaThread "XNIO-1 I/O-7" [_thread_in_native, id=4428, stack(0x000000002f020000,0x000000002f120000)] + 0x00000000200ba000 JavaThread "XNIO-1 I/O-6" [_thread_in_native, id=13256, stack(0x000000002ef20000,0x000000002f020000)] + 0x00000000200b2800 JavaThread "XNIO-1 I/O-5" [_thread_in_native, id=10604, stack(0x000000002ee20000,0x000000002ef20000)] + 0x00000000200b7000 JavaThread "XNIO-1 I/O-4" [_thread_in_native, id=12592, stack(0x000000002ed20000,0x000000002ee20000)] + 0x00000000200b9000 JavaThread "XNIO-1 I/O-3" [_thread_in_native, id=7584, stack(0x000000002e380000,0x000000002e480000)] + 0x00000000200b5800 JavaThread "XNIO-1 I/O-2" [_thread_in_native, id=16228, stack(0x000000002e280000,0x000000002e380000)] + 0x00000000200b4800 JavaThread "XNIO-1 I/O-1" [_thread_in_native, id=13056, stack(0x000000002def0000,0x000000002dff0000)] + 0x00000000200b6000 JavaThread "logback-8" daemon [_thread_blocked, id=13340, stack(0x000000002db30000,0x000000002dc30000)] + 0x00000000200b7800 JavaThread "logback-7" daemon [_thread_blocked, id=100, stack(0x0000000001590000,0x0000000001690000)] + 0x00000000200b1000 JavaThread "quartzScheduler_QuartzSchedulerThread" [_thread_blocked, id=14452, stack(0x000000002ec20000,0x000000002ed20000)] + 0x00000000200b0000 JavaThread "quartzScheduler_Worker-10" [_thread_blocked, id=4452, stack(0x000000002eb20000,0x000000002ec20000)] + 0x00000000200ae800 JavaThread "quartzScheduler_Worker-9" [_thread_blocked, id=16488, stack(0x000000002ea20000,0x000000002eb20000)] + 0x00000000200b3000 JavaThread "quartzScheduler_Worker-8" [_thread_blocked, id=10376, stack(0x000000002e920000,0x000000002ea20000)] + 0x00000000200b1800 JavaThread "quartzScheduler_Worker-7" [_thread_blocked, id=16016, stack(0x000000002e820000,0x000000002e920000)] + 0x00000000200af800 JavaThread "quartzScheduler_Worker-6" [_thread_blocked, id=2816, stack(0x000000002e720000,0x000000002e820000)] + 0x0000000020cfb800 JavaThread "quartzScheduler_Worker-5" [_thread_blocked, id=15152, stack(0x000000002e620000,0x000000002e720000)] + 0x0000000020cf8000 JavaThread "quartzScheduler_Worker-4" [_thread_blocked, id=17172, stack(0x000000002e520000,0x000000002e620000)] + 0x000000002296d800 JavaThread "quartzScheduler_Worker-3" [_thread_blocked, id=8972, stack(0x000000002dcf0000,0x000000002ddf0000)] + 0x000000002296c800 JavaThread "quartzScheduler_Worker-2" [_thread_blocked, id=16532, stack(0x000000002d610000,0x000000002d710000)] + 0x000000002296c000 JavaThread "quartzScheduler_Worker-1" [_thread_blocked, id=13484, stack(0x000000002cdb0000,0x000000002ceb0000)] + 0x000000002296b000 JavaThread "IdleConnectionMonitorThread" daemon [_thread_blocked, id=6000, stack(0x000000002ca10000,0x000000002cb10000)] + 0x0000000022969800 JavaThread "flowable-reset-expired-jobs" [_thread_blocked, id=15068, stack(0x000000002c910000,0x000000002ca10000)] + 0x0000000022962000 JavaThread "flowable-acquire-timer-jobs" [_thread_blocked, id=11808, stack(0x000000002c810000,0x000000002c910000)] + 0x0000000022969000 JavaThread "flowable-acquire-async-jobs" [_thread_blocked, id=11848, stack(0x000000002b9c0000,0x000000002bac0000)] + 0x0000000022968000 JavaThread "logback-6" daemon [_thread_blocked, id=15164, stack(0x0000000022330000,0x0000000022430000)] + 0x0000000022965000 JavaThread "logback-5" daemon [_thread_blocked, id=4184, stack(0x0000000020960000,0x0000000020a60000)] + 0x0000000022960800 JavaThread "logback-4" daemon [_thread_blocked, id=6808, stack(0x000000002c0c0000,0x000000002c1c0000)] + 0x0000000022964800 JavaThread "Druid-ConnectionPool-Destroy-191345497" daemon [_thread_blocked, id=5608, stack(0x000000002a4a0000,0x000000002a5a0000)] + 0x0000000022963800 JavaThread "Druid-ConnectionPool-Create-191345497" daemon [_thread_blocked, id=2820, stack(0x0000000028090000,0x0000000028190000)] + 0x0000000022966800 JavaThread "mysql-cj-abandoned-connection-cleanup" daemon [_thread_blocked, id=5096, stack(0x0000000027a00000,0x0000000027b00000)] + 0x000000002295e800 JavaThread "IdleConnectionMonitorThread" daemon [_thread_blocked, id=5416, stack(0x000000002b790000,0x000000002b890000)] + 0x0000000020cf7800 JavaThread "commons-pool-evictor-thread" daemon [_thread_blocked, id=6652, stack(0x0000000028560000,0x0000000028660000)] + 0x0000000020cfd000 JavaThread "logback-3" daemon [_thread_blocked, id=1700, stack(0x00000000236b0000,0x00000000237b0000)] + 0x0000000027418800 JavaThread "logback-2" daemon [_thread_blocked, id=10940, stack(0x00000000254d0000,0x00000000255d0000)] + 0x000000001eb1b000 JavaThread "logback-1" daemon [_thread_blocked, id=11296, stack(0x0000000020ae0000,0x0000000020be0000)] + 0x000000001ba33000 JavaThread "Service Thread" daemon [_thread_blocked, id=14292, stack(0x000000001cae0000,0x000000001cbe0000)] + 0x000000001b9a7800 JavaThread "C1 CompilerThread3" daemon [_thread_blocked, id=16036, stack(0x000000001c9e0000,0x000000001cae0000)] + 0x000000001b9a7000 JavaThread "C2 CompilerThread2" daemon [_thread_blocked, id=11920, stack(0x000000001c8e0000,0x000000001c9e0000)] + 0x000000001b9a4000 JavaThread "C2 CompilerThread1" daemon [_thread_blocked, id=15668, stack(0x000000001c7e0000,0x000000001c8e0000)] + 0x000000001b9a3800 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=6432, stack(0x000000001c6e0000,0x000000001c7e0000)] + 0x000000001a6c4800 JavaThread "JDWP Command Reader" daemon [_thread_in_native, id=17316, stack(0x000000001ae10000,0x000000001af10000)] + 0x000000001a6c1800 JavaThread "JDWP Event Helper Thread" daemon [_thread_blocked, id=13888, stack(0x000000001ad10000,0x000000001ae10000)] +=>0x000000001a6b6000 JavaThread "JDWP Transport Listener: dt_socket" daemon [_thread_in_vm, id=16124, stack(0x000000001ac10000,0x000000001ad10000)] + 0x000000001a6a5800 JavaThread "Attach Listener" daemon [_thread_blocked, id=13364, stack(0x000000001ab10000,0x000000001ac10000)] + 0x000000001a658000 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=15696, stack(0x000000001aa10000,0x000000001ab10000)] + 0x0000000018647000 JavaThread "Finalizer" daemon [_thread_blocked, id=6740, stack(0x000000001a510000,0x000000001a610000)] + 0x0000000018640000 JavaThread "Reference Handler" daemon [_thread_blocked, id=11248, stack(0x000000001a410000,0x000000001a510000)] + +Other Threads: + 0x000000001863c000 VMThread [stack: 0x000000001a310000,0x000000001a410000] [id=2104] + 0x000000001b996800 WatcherThread [stack: 0x000000001cbe0000,0x000000001cce0000] [id=5012] + +VM state:not at safepoint (normal execution) + +VM Mutex/Monitor currently owned by a thread: None + +Heap: + PSYoungGen total 608768K, used 148173K [0x00000000d6f80000, 0x00000000ff900000, 0x0000000100000000) + eden space 561664K, 22% used [0x00000000d6f80000,0x00000000decf3450,0x00000000f9400000) + from space 47104K, 41% used [0x00000000fcb00000,0x00000000fde40168,0x00000000ff900000) + to space 51712K, 0% used [0x00000000f9400000,0x00000000f9400000,0x00000000fc680000) + ParOldGen total 259072K, used 124005K [0x0000000084e00000, 0x0000000094b00000, 0x00000000d6f80000) + object space 259072K, 47% used [0x0000000084e00000,0x000000008c719700,0x0000000094b00000) + Metaspace used 104981K, capacity 109236K, committed 109388K, reserved 1144832K + class space used 12421K, capacity 13132K, committed 13184K, reserved 1048576K + +Card table byte_map: [0x0000000012c30000,0x0000000013010000] byte_map_base: 0x0000000012809000 + +Marking Bits: (ParMarkBitMap*) 0x0000000074584040 + Begin Bits: [0x0000000013ab0000, 0x0000000015978000) + End Bits: [0x0000000015978000, 0x0000000017840000) + +Polling page: 0x0000000000ff0000 + +CodeCache: size=245760Kb used=42160Kb max_used=44552Kb free=203599Kb + bounds [0x0000000003870000, 0x0000000006430000, 0x0000000012870000] + total_blobs=11285 nmethods=10620 adapters=584 + compilation: enabled + +Compilation events (10 events): +Event: 854.559 Thread 0x000000001b9a7800 14202 3 org.apache.ibatis.ognl.OgnlContext::getCurrentType (38 bytes) +Event: 854.560 Thread 0x000000001b9a7800 nmethod 14202 0x0000000004a09390 code [0x0000000004a09520, 0x0000000004a09a08] +Event: 854.563 Thread 0x000000001b9a7800 14203 3 org.apache.ibatis.ognl.OgnlContext::getPreviousType (53 bytes) +Event: 854.563 Thread 0x000000001b9a7800 nmethod 14203 0x00000000056022d0 code [0x0000000005602480, 0x0000000005602a78] +Event: 854.566 Thread 0x000000001b9a7800 14204 3 org.apache.ibatis.ognl.enhance.ExpressionCompiler::getInterfaceClass (51 bytes) +Event: 854.567 Thread 0x000000001b9a7800 nmethod 14204 0x00000000056c05d0 code [0x00000000056c07c0, 0x00000000056c1028] +Event: 854.567 Thread 0x000000001b9a7800 14205 ! 3 org.apache.ibatis.ognl.OgnlRuntime::getIndexedPropertyType (86 bytes) +Event: 854.570 Thread 0x000000001b9a7800 nmethod 14205 0x0000000003fd3490 code [0x0000000003fd36e0, 0x0000000003fd4608] +Event: 854.570 Thread 0x000000001b9a7800 14206 3 org.apache.ibatis.ognl.OgnlRuntime::getPropertyDescriptor (20 bytes) +Event: 854.570 Thread 0x000000001b9a7800 nmethod 14206 0x0000000003ead390 code [0x0000000003ead520, 0x0000000003ead898] + +GC Heap History (10 events): +Event: 54.739 GC heap before +{Heap before GC invocations=24 (full 3): + PSYoungGen total 631808K, used 622941K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000) + eden space 595456K, 100% used [0x00000000d6f80000,0x00000000fb500000,0x00000000fb500000) + from space 36352K, 75% used [0x00000000fdc80000,0x00000000ff757438,0x0000000100000000) + to space 38400K, 0% used [0x00000000fb500000,0x00000000fb500000,0x00000000fda80000) + ParOldGen total 169472K, used 70174K [0x0000000084e00000, 0x000000008f380000, 0x00000000d6f80000) + object space 169472K, 41% used [0x0000000084e00000,0x0000000089287890,0x000000008f380000) + Metaspace used 82522K, capacity 85534K, committed 85760K, reserved 1124352K + class space used 9947K, capacity 10483K, committed 10496K, reserved 1048576K +Event: 54.765 GC heap after +Heap after GC invocations=24 (full 3): + PSYoungGen total 633856K, used 38394K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000) + eden space 595456K, 0% used [0x00000000d6f80000,0x00000000d6f80000,0x00000000fb500000) + from space 38400K, 99% used [0x00000000fb500000,0x00000000fda7eb78,0x00000000fda80000) + to space 38400K, 0% used [0x00000000fda80000,0x00000000fda80000,0x0000000100000000) + ParOldGen total 169472K, used 70790K [0x0000000084e00000, 0x000000008f380000, 0x00000000d6f80000) + object space 169472K, 41% used [0x0000000084e00000,0x0000000089321b90,0x000000008f380000) + Metaspace used 82522K, capacity 85534K, committed 85760K, reserved 1124352K + class space used 9947K, capacity 10483K, committed 10496K, reserved 1048576K +} +Event: 59.357 GC heap before +{Heap before GC invocations=25 (full 3): + PSYoungGen total 633856K, used 633850K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000) + eden space 595456K, 100% used [0x00000000d6f80000,0x00000000fb500000,0x00000000fb500000) + from space 38400K, 99% used [0x00000000fb500000,0x00000000fda7eb78,0x00000000fda80000) + to space 38400K, 0% used [0x00000000fda80000,0x00000000fda80000,0x0000000100000000) + ParOldGen total 169472K, used 70790K [0x0000000084e00000, 0x000000008f380000, 0x00000000d6f80000) + object space 169472K, 41% used [0x0000000084e00000,0x0000000089321b90,0x000000008f380000) + Metaspace used 93240K, capacity 96872K, committed 97024K, reserved 1134592K + class space used 11076K, capacity 11702K, committed 11776K, reserved 1048576K +Event: 59.504 GC heap after +Heap after GC invocations=25 (full 3): + PSYoungGen total 598016K, used 38373K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000) + eden space 559616K, 0% used [0x00000000d6f80000,0x00000000d6f80000,0x00000000f9200000) + from space 38400K, 99% used [0x00000000fda80000,0x00000000ffff9548,0x0000000100000000) + to space 56320K, 0% used [0x00000000f9200000,0x00000000f9200000,0x00000000fc900000) + ParOldGen total 169472K, used 91761K [0x0000000084e00000, 0x000000008f380000, 0x00000000d6f80000) + object space 169472K, 54% used [0x0000000084e00000,0x000000008a79c4c8,0x000000008f380000) + Metaspace used 93240K, capacity 96872K, committed 97024K, reserved 1134592K + class space used 11076K, capacity 11702K, committed 11776K, reserved 1048576K +} +Event: 60.001 GC heap before +{Heap before GC invocations=26 (full 3): + PSYoungGen total 598016K, used 106501K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000) + eden space 559616K, 12% used [0x00000000d6f80000,0x00000000db207ff8,0x00000000f9200000) + from space 38400K, 99% used [0x00000000fda80000,0x00000000ffff9548,0x0000000100000000) + to space 56320K, 0% used [0x00000000f9200000,0x00000000f9200000,0x00000000fc900000) + ParOldGen total 169472K, used 91761K [0x0000000084e00000, 0x000000008f380000, 0x00000000d6f80000) + object space 169472K, 54% used [0x0000000084e00000,0x000000008a79c4c8,0x000000008f380000) + Metaspace used 94683K, capacity 98274K, committed 98380K, reserved 1136640K + class space used 11253K, capacity 11869K, committed 11904K, reserved 1048576K +Event: 60.027 GC heap after +Heap after GC invocations=26 (full 3): + PSYoungGen total 615936K, used 16402K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000) + eden space 559616K, 0% used [0x00000000d6f80000,0x00000000d6f80000,0x00000000f9200000) + from space 56320K, 29% used [0x00000000f9200000,0x00000000fa2049e0,0x00000000fc900000) + to space 54272K, 0% used [0x00000000fcb00000,0x00000000fcb00000,0x0000000100000000) + ParOldGen total 169472K, used 115890K [0x0000000084e00000, 0x000000008f380000, 0x00000000d6f80000) + object space 169472K, 68% used [0x0000000084e00000,0x000000008bf2ca20,0x000000008f380000) + Metaspace used 94683K, capacity 98274K, committed 98380K, reserved 1136640K + class space used 11253K, capacity 11869K, committed 11904K, reserved 1048576K +} +Event: 60.027 GC heap before +{Heap before GC invocations=27 (full 4): + PSYoungGen total 615936K, used 16402K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000) + eden space 559616K, 0% used [0x00000000d6f80000,0x00000000d6f80000,0x00000000f9200000) + from space 56320K, 29% used [0x00000000f9200000,0x00000000fa2049e0,0x00000000fc900000) + to space 54272K, 0% used [0x00000000fcb00000,0x00000000fcb00000,0x0000000100000000) + ParOldGen total 169472K, used 115890K [0x0000000084e00000, 0x000000008f380000, 0x00000000d6f80000) + object space 169472K, 68% used [0x0000000084e00000,0x000000008bf2ca20,0x000000008f380000) + Metaspace used 94683K, capacity 98274K, committed 98380K, reserved 1136640K + class space used 11253K, capacity 11869K, committed 11904K, reserved 1048576K +Event: 60.411 GC heap after +Heap after GC invocations=27 (full 4): + PSYoungGen total 615936K, used 0K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000) + eden space 559616K, 0% used [0x00000000d6f80000,0x00000000d6f80000,0x00000000f9200000) + from space 56320K, 0% used [0x00000000f9200000,0x00000000f9200000,0x00000000fc900000) + to space 54272K, 0% used [0x00000000fcb00000,0x00000000fcb00000,0x0000000100000000) + ParOldGen total 259072K, used 123997K [0x0000000084e00000, 0x0000000094b00000, 0x00000000d6f80000) + object space 259072K, 47% used [0x0000000084e00000,0x000000008c717700,0x0000000094b00000) + Metaspace used 94683K, capacity 98274K, committed 98380K, reserved 1136640K + class space used 11253K, capacity 11869K, committed 11904K, reserved 1048576K +} +Event: 230.903 GC heap before +{Heap before GC invocations=28 (full 4): + PSYoungGen total 615936K, used 559616K [0x00000000d6f80000, 0x0000000100000000, 0x0000000100000000) + eden space 559616K, 100% used [0x00000000d6f80000,0x00000000f9200000,0x00000000f9200000) + from space 56320K, 0% used [0x00000000f9200000,0x00000000f9200000,0x00000000fc900000) + to space 54272K, 0% used [0x00000000fcb00000,0x00000000fcb00000,0x0000000100000000) + ParOldGen total 259072K, used 123997K [0x0000000084e00000, 0x0000000094b00000, 0x00000000d6f80000) + object space 259072K, 47% used [0x0000000084e00000,0x000000008c717700,0x0000000094b00000) + Metaspace used 99900K, capacity 103790K, committed 103884K, reserved 1140736K + class space used 11821K, capacity 12479K, committed 12544K, reserved 1048576K +Event: 230.921 GC heap after +Heap after GC invocations=28 (full 4): + PSYoungGen total 608768K, used 19712K [0x00000000d6f80000, 0x00000000ff900000, 0x0000000100000000) + eden space 561664K, 0% used [0x00000000d6f80000,0x00000000d6f80000,0x00000000f9400000) + from space 47104K, 41% used [0x00000000fcb00000,0x00000000fde40168,0x00000000ff900000) + to space 51712K, 0% used [0x00000000f9400000,0x00000000f9400000,0x00000000fc680000) + ParOldGen total 259072K, used 124005K [0x0000000084e00000, 0x0000000094b00000, 0x00000000d6f80000) + object space 259072K, 47% used [0x0000000084e00000,0x000000008c719700,0x0000000094b00000) + Metaspace used 99900K, capacity 103790K, committed 103884K, reserved 1140736K + class space used 11821K, capacity 12479K, committed 12544K, reserved 1048576K +} + +Deoptimization events (10 events): +Event: 445.785 Thread 0x0000000020cfe800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003ac48c0 method=java.util.AbstractList$Itr.next()Ljava/lang/Object; @ 14 +Event: 602.775 Thread 0x0000000020d02800 Uncommon trap: reason=range_check action=none pc=0x0000000003c889dc method=sun.reflect.generics.parser.SignatureParser.current()C @ 34 +Event: 602.818 Thread 0x0000000020d02800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000004f5680c method=java.util.Date.normalize()Lsun/util/calendar/BaseCalendar$Date; @ 45 +Event: 602.899 Thread 0x0000000020d02800 Uncommon trap: reason=unhandled action=none pc=0x0000000003a1a708 method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44 +Event: 602.987 Thread 0x0000000020d02800 Uncommon trap: reason=unhandled action=none pc=0x0000000003a1a708 method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44 +Event: 602.991 Thread 0x0000000020d02800 Uncommon trap: reason=unhandled action=none pc=0x0000000003a1a708 method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44 +Event: 602.997 Thread 0x0000000020d02800 Uncommon trap: reason=unhandled action=none pc=0x0000000003a1a708 method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44 +Event: 602.999 Thread 0x0000000020d02800 Uncommon trap: reason=unhandled action=none pc=0x0000000003a1a708 method=java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class; @ 44 +Event: 603.044 Thread 0x0000000020d02800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003ac48c0 method=java.util.AbstractList$Itr.next()Ljava/lang/Object; @ 14 +Event: 714.941 Thread 0x0000000020d08000 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x0000000003ac48c0 method=java.util.AbstractList$Itr.next()Ljava/lang/Object; @ 14 + +Internal exceptions (10 events): +Event: 711.696 Thread 0x0000000020d08000 Exception (0x00000000ddac4d18) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\runtime\reflection.cpp, line 1080] +Event: 711.696 Thread 0x0000000020d08000 Exception (0x00000000ddac5510) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\runtime\reflection.cpp, line 1080] +Event: 711.697 Thread 0x0000000020d08000 Exception (0x00000000ddac5d08) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\runtime\reflection.cpp, line 1080] +Event: 711.697 Thread 0x0000000020d08000 Exception (0x00000000ddac6500) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\runtime\reflection.cpp, line 1080] +Event: 711.701 Thread 0x0000000020d08000 Exception (0x00000000ddadd0f0) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\runtime\reflection.cpp, line 1080] +Event: 711.990 Thread 0x0000000020d08000 Exception (0x00000000ddf4f6a0) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\classfile\systemDictionary.cpp, line 210] +Event: 711.991 Thread 0x0000000020d08000 Exception (0x00000000ddf52c00) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\interpreter\interpreterRuntime.cpp, line 366] +Event: 712.000 Thread 0x0000000020d08000 Exception (0x00000000ddf9bee8) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\classfile\systemDictionary.cpp, line%@@ +Event: 712.003 Thread 0x0000000020d08000 Exception (0x00000000ddfaae80) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\interpreter\interpreterRuntime.cpp, line 366] +Event: 714.915 Thread 0x0000000020d08000 Exception (0x00000000de196358) thrown at [D:\re\workspace\8-2-build-windows-amd64-cygwin\jdk8u40\2855\hotspot\src\share\vm\runtime\reflection.cpp, line 1080] + +Events (10 events): +Event: 840.729 Thread 0x000000001b9a3800 flushing nmethod 0x000000000574fa10 +Event: 840.729 Thread 0x000000001b9a3800 flushing nmethod 0x0000000005757850 +Event: 840.729 Thread 0x000000001b9a3800 flushing nmethod 0x000000000576ca10 +Event: 850.879 Thread 0x000000001b9a4000 flushing nmethod 0x00000000057d1590 +Event: 850.879 Thread 0x000000001b9a4000 flushing nmethod 0x000000000583b990 +Event: 854.561 Thread 0x000000001b9a7800 flushing nmethod 0x0000000005e4d850 +Event: 860.771 Executing VM operation: RevokeBias +Event: 860.771 Executing VM operation: RevokeBias done +Event: 863.930 Executing VM operation: RedefineClasses +Event: 864.011 Executing VM operation: RedefineClasses done + + +Dynamic libraries: +0x00007ff7c2ea0000 - 0x00007ff7c2ed7000 C:\soft-install\JDK8\JDK8\bin\javaw.exe +0x00007ff808320000 - 0x00007ff808510000 C:\WINDOWS\SYSTEM32\ntdll.dll +0x00007ff8063d0000 - 0x00007ff806482000 C:\WINDOWS\System32\KERNEL32.DLL +0x00007ff805880000 - 0x00007ff805b24000 C:\WINDOWS\System32\KERNELBASE.dll +0x00007ff806be0000 - 0x00007ff806c83000 C:\WINDOWS\System32\ADVAPI32.dll +0x00007ff806c90000 - 0x00007ff806d2e000 C:\WINDOWS\System32\msvcrt.dll +0x00007ff807280000 - 0x00007ff807317000 C:\WINDOWS\System32\sechost.dll +0x00007ff807610000 - 0x00007ff807730000 C:\WINDOWS\System32\RPCRT4.dll +0x00007ff806a40000 - 0x00007ff806bd5000 C:\WINDOWS\System32\USER32.dll +0x00007ff8055c0000 - 0x00007ff8055e1000 C:\WINDOWS\System32\win32u.dll +0x00007ff806a10000 - 0x00007ff806a36000 C:\WINDOWS\System32\GDI32.dll +0x00007ff8053f0000 - 0x00007ff805586000 C:\WINDOWS\System32\gdi32full.dll +0x00007ff805770000 - 0x00007ff80580e000 C:\WINDOWS\System32\msvcp_win.dll +0x00007ff8055f0000 - 0x00007ff8056ea000 C:\WINDOWS\System32\ucrtbase.dll +0x00007ffff59e0000 - 0x00007ffff5c64000 C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.18362.1016_none_9e7a36bbe461dae4\COMCTL32.dll +0x00007ff807e20000 - 0x00007ff808155000 C:\WINDOWS\System32\combase.dll +0x00007ff8056f0000 - 0x00007ff805770000 C:\WINDOWS\System32\bcryptPrimitives.dll +0x00007ff8071e0000 - 0x00007ff80720e000 C:\WINDOWS\System32\IMM32.DLL +0x0000000074900000 - 0x00000000749d2000 C:\soft-install\JDK8\JDK8\jre\bin\msvcr100.dll +0x0000000073d80000 - 0x0000000074603000 C:\soft-install\JDK8\JDK8\jre\bin\server\jvm.dll +0x00007ff8071d0000 - 0x00007ff8071d8000 C:\WINDOWS\System32\PSAPI.DLL +0x00007ff800840000 - 0x00007ff80084a000 C:\WINDOWS\SYSTEM32\VERSION.dll +0x00007ffffb6e0000 - 0x00007ffffb704000 C:\WINDOWS\SYSTEM32\WINMM.dll +0x00007fffff380000 - 0x00007fffff389000 C:\WINDOWS\SYSTEM32\WSOCK32.dll +0x00007ff807210000 - 0x00007ff80727f000 C:\WINDOWS\System32\WS2_32.dll +0x00007ffffb490000 - 0x00007ffffb4bd000 C:\WINDOWS\SYSTEM32\winmmbase.dll +0x00007ff805830000 - 0x00007ff80587a000 C:\WINDOWS\System32\cfgmgr32.dll +0x0000000073c90000 - 0x0000000073c9f000 C:\soft-install\JDK8\JDK8\jre\bin\verify.dll +0x0000000073c60000 - 0x0000000073c89000 C:\soft-install\JDK8\JDK8\jre\bin\java.dll +0x00000000748c0000 - 0x00000000748f5000 C:\soft-install\JDK8\JDK8\jre\bin\jdwp.dll +0x00000000748b0000 - 0x00000000748b8000 C:\soft-install\JDK8\JDK8\jre\bin\npt.dll +0x0000000073c30000 - 0x0000000073c53000 C:\soft-install\JDK8\JDK8\jre\bin\instrument.dll +0x0000000073c10000 - 0x0000000073c26000 C:\soft-install\JDK8\JDK8\jre\bin\zip.dll +0x00007ff807730000 - 0x00007ff807e17000 C:\WINDOWS\System32\SHELL32.dll +0x00007ff8064f0000 - 0x00007ff806599000 C:\WINDOWS\System32\shcore.dll +0x00007ff805b90000 - 0x00007ff806312000 C:\WINDOWS\System32\windows.storage.dll +0x00007ff8051e0000 - 0x00007ff805203000 C:\WINDOWS\System32\profapi.dll +0x00007ff805210000 - 0x00007ff80525a000 C:\WINDOWS\System32\powrprof.dll +0x00007ff8051d0000 - 0x00007ff8051e0000 C:\WINDOWS\System32\UMPDC.dll +0x00007ff806490000 - 0x00007ff8064e2000 C:\WINDOWS\System32\shlwapi.dll +0x00007ff805280000 - 0x00007ff805291000 C:\WINDOWS\System32\kernel.appcore.dll +0x00007ff805810000 - 0x00007ff805827000 C:\WINDOWS\System32\cryptsp.dll +0x00000000748a0000 - 0x00000000748a9000 C:\soft-install\JDK8\JDK8\jre\bin\dt_socket.dll +0x00007fffeb320000 - 0x00007fffeb336000 C:\WINDOWS\system32\napinsp.dll +0x00007fffea5a0000 - 0x00007fffea5ba000 C:\WINDOWS\system32\pnrpnsp.dll +0x00007ff8049d0000 - 0x00007ff804a37000 C:\WINDOWS\System32\mswsock.dll +0x00007ff804720000 - 0x00007ff8047eb000 C:\WINDOWS\SYSTEM32\DNSAPI.dll +0x00007ff807600000 - 0x00007ff807608000 C:\WINDOWS\System32\NSI.dll +0x00007ff8046e0000 - 0x00007ff80471a000 C:\WINDOWS\SYSTEM32\IPHLPAPI.DLL +0x00007ffffd1e0000 - 0x00007ffffd1ee000 C:\WINDOWS\System32\winrnr.dll +0x00007ffffef40000 - 0x00007ffffef5c000 C:\WINDOWS\system32\NLAapi.dll +0x00007ffff7a40000 - 0x00007ffff7a55000 C:\WINDOWS\system32\wshbth.dll +0x00007ffffeec0000 - 0x00007ffffef37000 C:\WINDOWS\System32\fwpuclnt.dll +0x00007ff805590000 - 0x00007ff8055b6000 C:\WINDOWS\System32\bcrypt.dll +0x00007ffffbbb0000 - 0x00007ffffbbba000 C:\Windows\System32\rasadhlp.dll +0x0000000074890000 - 0x000000007489d000 C:\soft-install\JDK8\JDK8\jre\bin\management.dll +0x0000000073bf0000 - 0x0000000073c0a000 C:\soft-install\JDK8\JDK8\jre\bin\net.dll +0x0000000073bd0000 - 0x0000000073be1000 C:\soft-install\JDK8\JDK8\jre\bin\nio.dll +0x0000000073ba0000 - 0x0000000073bc4000 C:\soft-install\JDK8\JDK8\jre\bin\sunec.dll +0x00007ff804540000 - 0x00007ff804573000 C:\WINDOWS\system32\rsaenh.dll +0x00007ff8050f0000 - 0x00007ff805115000 C:\WINDOWS\SYSTEM32\USERENV.dll +0x00007ff804ba0000 - 0x00007ff804bac000 C:\WINDOWS\SYSTEM32\CRYPTBASE.dll +0x00007fffff150000 - 0x00007fffff166000 C:\WINDOWS\SYSTEM32\dhcpcsvc6.DLL +0x00007fffff800000 - 0x00007fffff81c000 C:\WINDOWS\SYSTEM32\dhcpcsvc.DLL +0x0000000074880000 - 0x000000007488b000 C:\soft-install\JDK8\JDK8\jre\bin\sunmscapi.dll +0x00007ff8052a0000 - 0x00007ff8053e9000 C:\WINDOWS\System32\CRYPT32.dll +0x00007ff805260000 - 0x00007ff805272000 C:\WINDOWS\System32\MSASN1.dll +0x00007ffffdc80000 - 0x00007ffffde74000 C:\WINDOWS\SYSTEM32\dbghelp.dll + +VM Arguments: +jvm_args: -agentlib:jdwp=transport=dt_socket,suspend=y,address=localhost:52559 -javaagent:C:\soft-install\jee-2019-09\eclipse\configuration\org.eclipse.osgi\412\0\.cp\lib\javaagent-shaded.jar -Dfile.encoding=UTF-8 +java_command: com.iformall.UserApplication +java_class_path (initial): C:\project\formall\formallWu\formallProject\mallinkAdmin\target\classes;C:\Users\alascor\.m2\repository\javax\activation\activation\1.1\activation-1.1.jar;C:\Users\alascor\.m2\repository\javax\xml\bind\jaxb-api\2.3.0\jaxb-api-2.3.0.jar;C:\project\formall\formallWu\formallProject\mallinkService\target\classes;C:\Users\alascor\.m2\repository\net\sf\dozer\dozer\5.5.1\dozer-5.5.1.jar;C:\Users\alascor\.m2\repository\commons-beanutils\commons-beanutils\1.9.1\commons-beanutils-1.9.1.jar;C:\Users\alascor\.m2\repository\commons-collections\commons-collections\3.2.1\commons-collections-3.2.1.jar;C:\Users\alascor\.m2\repository\org\apache\commons\commons-lang3\3.8\commons-lang3-3.8.jar;C:\Users\alascor\.m2\repository\org\slf4j\slf4j-api\1.7.30\slf4j-api-1.7.30.jar;C:\Users\alascor\.m2\repository\org\slf4j\jcl-over-slf4j\1.7.30\jcl-over-slf4j-1.7.30.jar;C:\Users\alascor\.m2\repository\org\springframework\boot\spring-boot-starter-web\2.2.5.RELEASE\spring-boot-starter-web-2.2.5.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\boot\spring-boot-starter\2.2.5.RELEASE\spring-boot-starter-2.2.5.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\boot\spring-boot\2.2.5.RELEASE\spring-boot-2.2.5.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\spring-core\5.2.4.RELEASE\spring-core-5.2.4.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\spring-jcl\5.2.4.RELEASE\spring-jcl-5.2.4.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\spring-context\5.2.4.RELEASE\spring-context-5.2.4.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\spring-aop\5.2.4.RELEASE\spring-aop-5.2.4.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\spring-beans\5.2.4.RELEASE\spring-beans-5.2.4.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\spring-expression\5.2.4.RELEASE\spring-expression-5.2.4.RELEASE.jar;C:\Users\alascor\.m2\repository\org\springframework\boot\spring-boot-autoc +Launcher Type: SUN_STANDARD + +Environment Variables: +JAVA_HOME=C:\soft-install\JDK8\JDK8 +CLASSPATH=.;C:\soft-install\JDK8\JDK8\lib;C:\soft-install\JDK8\JDK8\lib\tools.jar +PATH=C:/soft-install/JDK8/JDK8/bin/../jre/bin/server;C:/soft-install/JDK8/JDK8/bin/../jre/bin;C:/soft-install/JDK8/JDK8/bin/../jre/lib/amd64;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\soft-install\Git\cmd\;%installation home%\bin\;C:\Users\alascor\AppData\Local\Microsoft\WindowsApps;C:\soft-install\JDK8\JDK8\bin;C:\soft-install\JDK8\JDK8\jre\bin;C:\soft-install\apache-maven-3.3.9\apache-maven-3.3.9\bin;;C:\Users\alascor\Desktop; +USERNAME=alascor +OS=Windows_NT +PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 60 Stepping 3, GenuineIntel + + + +--------------- S Y S T E M --------------- + +OS: Windows 10.0 , 64 bit Build 18362 (10.0.18362.959) + +CPU:total 8 (4 cores per cpu, 2 threads per core) family 6 model 60 stepping 3, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, clmul, erms, lzcnt, ht, tsc, tscinvbit, bmi1, bmi2 + +Memory: 4k page, physical 8068152k(1413072k free), swap 14621752k(5906776k free) + +vm_info: Java HotSpot(TM) 64-Bit Server VM (25.40-b25) for windows-amd64 JRE (1.8.0_40-b25), built on Feb 10 2015 21:53:57 by "java_re" with MS VC++ 10.0 (VS2010) + +time: Mon Aug 17 15:00:20 2020 +elapsed time: 864 seconds (0d 0h 14m 24s) + diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index f55495cc2..010759d47 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -98,12 +98,13 @@ public class WxMerchantController extends BaseController { @ApiImplicitParams({ }) @SystemControllerLog(description = "商户-列表") - public ResultData IdAndNamelist(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { + public ResultData IdAndNamelist(@ModelAttribute WxMerchant wxMerchant, Integer type,Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); + wxMerchant.setType(type); return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant)); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index bc0a63ff3..5cbffe08f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -453,7 +453,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); WxRentContract wxRentContract = new WxRentContract(); wxRentContract.updateTenantInfo(record); - Long shopId = rentInfoObject.getLong("shopId"); + Long shopId = rentInfoObject.getLong("id"); //wxRentContract.setShopId(shopId); int count = wxRentContractMapper.selectRentContractCountByShopId(wxRentContract.getTenantId(),wxRentContract.getParentTenantId(),shopId,wxRentContract.getId()); String shopNumber = rentInfoObject.getString("shopNumber"); @@ -475,9 +475,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (wxShop == null) { return new ResultData(ErrorCode.SHOP_IS_NOT_FOUND.getCode(), "店铺 " + shopNumber + " 不存在"); } - if (wxShop.getStatus().equals(EnumShopStatus.RENT.getCode())) { - return new ResultData(ErrorCode.SHOP_IS_RENT.getCode(), "店铺 " + wxShop.getShopNumber() + " 已出租"); - } + //if (wxShop.getStatus().equals(EnumShopStatus.RENT.getCode())) { + // return new ResultData(ErrorCode.SHOP_IS_RENT.getCode(), "店铺 " + wxShop.getShopNumber() + " 已出租"); + //} } if (!shopList.contains(shopId)) { shopList.add(shopId); @@ -498,17 +498,17 @@ public class WxRentContractServiceImpl implements WxRentContractService { throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } -// //生成预览账单(补录第二步,第三步走编辑) -// if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null -// && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0l)) { -// wxBillRentMapper.deletePreviewBill(record); -// //重新生成 -// List resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode(),true); -// record.setPreviewBillRentList(resultList); -// } + //生成预览账单(补录第二步,第三步走编辑) + if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null + && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0l)) { + wxBillRentMapper.deletePreviewBill(record); + //重新生成 + List resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true); + record.setPreviewBillRentList(resultList); + } //创建预览账单 - List resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true); - record.setPreviewBillRentList(resultList); +// List resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true); +// record.setPreviewBillRentList(resultList); EventUtil.publistRentEvent(this, record); return new ResultData(Result.SUCCESS, "保存租赁合同信息成功", record); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index be9393007..97c7a632c 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -436,7 +436,7 @@ and `parent_tenant_id` = #{parentTenantId} - and json_contains(json_extract(rent_info,'$[*].shopId'),concat('"',${shopId},'"')) and status in (2,3,4) + and json_contains(json_extract(rent_info,'$[*].shopId'),concat('"',#{shopId},'"')) and status in (2,3,4) and id!=#{id}