唯品会订单bug修复，APP端佣金比例展示错误bug修复

admin

2020-06-10 271ae63c20fcbe28d29c47f1881138ff6551a2a1

 fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java

@@ -1,6 +1,5 @@
package com.yeshi.fanli.aspect;



import java.io.IOException;

import java.io.PrintWriter;

import java.lang.reflect.Method;

import java.util.HashMap;

@@ -63,7 +62,7 @@
   }



   @Around("execution(public * com.yeshi.fanli.controller.client.*.*.*(..))")

   public Object requestSerializable(ProceedingJoinPoint joinPoint) throws IOException {

   public Object requestSerializable(ProceedingJoinPoint joinPoint) throws Throwable {

      Signature signature = joinPoint.getSignature();

      MethodSignature methodSignature = (MethodSignature) signature;

      Method targetMethod = methodSignature.getMethod();

@@ -97,20 +96,16 @@
                  cacheKey = "rs-" + StringUtil.Md5(cacheKey);

                  // jiedis原子性做拦截

                  Jedis jedis = jedisPool.getResource();

                  long threadId= Thread.currentThread().getId();

                  LogHelper.test("进入拦截:"+cacheKey+"-"+threadId);

                  long threadId = Thread.currentThread().getId();

                  try {

                     Constant.waitingThreadSet.add(threadId);

                     String result = null;

                     long startTime = System.currentTimeMillis();

                     // 等待响应

                     while (StringUtil.isNullOrEmpty(result)) {

								


                        result = jedis.set(cacheKey, "1", new SetParams().nx().ex(30));

                        LogHelper.error("触发并发锁:" + cacheAlias);

                        LogHelper.error("redis键:" + cacheKey);

                        if (StringUtil.isNullOrEmpty(result)) {

                           LogHelper.test("等待:"+threadId);

                           try {

                              Thread.sleep(50);

                           } catch (InterruptedException e) {

@@ -122,7 +117,6 @@
                              return null;

                           }

                        } else {

                           LogHelper.test("获取到锁:"+threadId);

                           break;

                        }

                     }

@@ -130,14 +124,9 @@
                     if (!StringUtil.isNullOrEmpty(result)) {

                        try {

                           return joinPoint.proceed();

                        } catch (Throwable e) {

                           e.printStackTrace();

                           LogHelper.errorDetailInfo(e);

                        } finally {

                           LogHelper.test("方法执行完毕:"+threadId);

                           jedis.del(cacheKey);

                           Constant.waitingThreadSet.remove(Thread.currentThread().getId());

                           LogHelper.test("释放锁:"+threadId);

                        }

                     }

                  } finally {

@@ -145,12 +134,7 @@
                  }

               }

            } catch (Exception e) {// 原子性保护出错

               try {

                  return joinPoint.proceed();

               } catch (Throwable e1) {

                  e.printStackTrace();

                  LogHelper.errorDetailInfo(e1);

               }

               return joinPoint.proceed();

            }

         }



@@ -164,7 +148,10 @@
         return joinPoint.proceed();

      } catch (Throwable e) {

         e.printStackTrace();

         LogHelper.errorDetailInfo(e);

         if (!Constant.IS_TEST)

            LogHelper.errorDetailInfo(e);

         else

            throw e;

      } finally {

      }

      return null;