submit

run-prod.sh

@@ -2,23 +2,23 @@
 # 定义应用组名
 group_admin_name='zhongzheng'
 # 定义应用名称
-app_admin_name='zhongzheng-saas-admin-top'
+app_admin_name='zhongzheng-saas-admin'
 # 定义应用版本
 app_admin_version='1.0-SNAPSHOT'
 # 定义应用环境
 profile_active='prod'
-echo '----copy jar admin top----'
+echo '----copy jar admin----'
 docker stop ${app_admin_name}
-echo '----stop container admin top----'
+echo '----stop container admin----'
 docker rm ${app_admin_name}
-echo '----rm container admin top----'
+echo '----rm container admin----'
 docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
-echo '----rm image admin top----'
+echo '----rm image admin----'
 # 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile-saas -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
-echo '----build image admin top----'
+docker build -f /mydata/maven/build/Dockerfile-admi -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
+echo '----build image admin----'
 docker run \
--p 7077:7077 \
+-p 5030:5030 \
 --name ${app_admin_name} \
 --restart=always \
 --log-opt max-size=50m \
@@ -27,8 +27,8 @@ docker run \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
--v /data/logs/prod_admin_top:/logs \
+-v /data/logs/prod_admin:/logs \
 -v /mydata/app/${app_admin_name}/logs:/var/logs \
 -v /data/nginx/conf.d:/data/nginx/conf.d \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
-echo '----start container admin top----'
+echo '----start container admin----'

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -863,6 +863,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 redisLockEntity.setLockKey(RedisLockEntity.KEY_LOCK_GRADE);
                 redisLockEntity.setRequestId(requestId);
                 boolean isArrange = false;
+                log.error("请求参数:"+JSONObject.toJSONString(g));
                 if (redisCache.lock(redisLockEntity)) {
                     isArrange = arrangeGrade(goods.getGoodsName(), goods.getGoodsId(), orderGoods.getOrderGoodsId(), gradeId, add.getUserId(), out_trade_no, goods.getBusinessId());
                     redisCache.unlockLua(redisLockEntity);
@@ -2783,6 +2784,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         String sevenYear = goods.getSevenYear();
         //指定班级
         if (gradeId != null && gradeId > 0) {
+            log.error("班级ID："+gradeId);
             ClassGradeVo classGradeVo = iClassGradeService.queryById(gradeId);
             if (classGradeVo == null) {
                 throw new CustomException("班级不存在");