MERGE

run-prod.sh

@@ -1,3 +1,42 @@
+#!/usr/bin/env bash
+# 定义应用组名
+group_name='zhongzheng'
+# 定义应用名称
+app_name='zhongzheng-saas-api'
+# 定义应用版本
+app_version='1.0-SNAPSHOT'
+# 定义应用环境
+profile_active='prod'
+echo '----copy jar----'
+docker stop ${app_name}
+echo '----stop container----'
+docker rm ${app_name}
+echo '----rm container----'
+docker rmi ${group_name}/${app_name}:${app_version}
+echo '----rm image----'
+# 打包编译docker镜像
+docker build -f /mydata/maven/build/Dockerfile -t ${group_name}/${app_name}:${app_version} .
+echo '----build image----'
+docker run -p 5055:5055 --name ${app_name} \
+--restart=always \
+-e 'spring.profiles.active'=${profile_active} \
+-e TZ="Asia/Shanghai" \
+-m 10240m \
+--cpus=3 \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
+-v /etc/localtime:/etc/localtime \
+-v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/prod_api:/logs \
+-v /mydata/app/${app_name}/logs:/var/logs \
+-d ${group_name}/${app_name}:${app_version}
+echo '----start container----'
+
+echo "开始等待20秒..."
+# 1-10秒内随机
+sleep 5
+echo "等待后继续"
+
 #!/usr/bin/env bash
 # 定义应用组名
 group_admin_name='zhongzheng'
@@ -32,3 +71,46 @@ docker run \
 -v /data/nginx/conf.d:/data/nginx/conf.d \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'
+
+echo "开始等待20秒..."
+# 1-10秒内随机
+sleep 5
+echo "等待后继续"
+
+#!/usr/bin/env bash
+# 定义应用组名
+group_admin_name='zhongzheng'
+# 定义应用名称
+app_admin_name='zhongzheng-saas-admin-top'
+# 定义应用版本
+app_admin_version='1.0-SNAPSHOT'
+# 定义应用环境
+profile_active='prod'
+echo '----copy jar admin top----'
+docker stop ${app_admin_name}
+echo '----stop container admin top----'
+docker rm ${app_admin_name}
+echo '----rm container admin top----'
+docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
+echo '----rm image admin top----'
+# 打包编译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 run \
+-p 7077:7077 \
+--name ${app_admin_name} \
+--restart=always \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
+-e 'spring.profiles.active'=${profile_active} \
+-e TZ="Asia/Shanghai" \
+-v /etc/localtime:/etc/localtime \
+-v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/prod_admin_top:/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----'
+
+
+

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderQueryBo.java

@@ -169,4 +169,7 @@ public class TopOldOrderQueryBo extends BaseEntity {
 
 	@ApiModelProperty("补款金额标识")
 	private Integer repairSign;
+
+	@ApiModelProperty("学员审核状态")
+	private Integer studentCheckStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -1125,8 +1125,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
     @Override
     public List<TopOldOrderGoodsListVo> getOrderGoodsList(TopOldOrderGoodsQuery query) {
-        //奖金
-        TopOldOrder oldOrder = baseMapper.getOrderBySn(query.getOrderSn());
         //学员数量
         Integer userCount = 0;
         List<TopOldOrderGoodsListVo> list;
@@ -1297,6 +1295,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 }
             }
         }
+        //奖金
+        TopOldOrder oldOrder = baseMapper.getOrderBySn(query.getOrderSn());
         BigDecimal money = BigDecimal.ZERO;
         if (ObjectUtils.isNotNull(oldOrder.getPretaxBrokerage())){
             money = oldOrder.getPretaxBrokerage().divide(new BigDecimal(list.size()));

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -124,8 +124,11 @@
         <if test="purchaseOrg != null and purchaseOrg != ''">
             AND vto.purchase_org LIKE CONCAT( '%', #{purchaseOrg}, '%' )
         </if>
-        <if test="createSysUserId != null and createSysUserId != ''">
-            AND vto.create_sys_user_id LIKE CONCAT( '%', #{createNo}, '%' )
+        <if test="createNo != null and createNo != ''">
+            AND vto.create_no LIKE CONCAT( '%', #{createNo}, '%' )
+        </if>
+        <if test="createUsername != null and createUsername != ''">
+            AND vto.create_username LIKE CONCAT( '%', #{createUsername}, '%' )
         </if>
         <if test="startTime != null and startTime != ''">
             AND vto.buy_time <![CDATA[ >= ]]> #{startTime}
@@ -148,6 +151,12 @@
         <if test="tenantId != null and tenantId != ''">
             AND vto.tenant_id = #{tenantId}
         </if>
+        <if test="studentCheckStatus != null">
+            AND (vto.order_from != 1
+                AND (SELECT COUNT(too.order_sn)
+                FROM top_old_order_goods too
+                WHERE vto.order_sn = too.order_sn AND too.rel_sign_id IS NOT NULL AND too.check_status = #{studentCheckStatus}) > 0)
+        </if>
         <if test="orderSnList != null and orderSnList.size()!=0 ">
             AND vto.order_sn in
             <foreach collection="orderSnList" item="item" index="index" open="(" close=")" separator=",">
@@ -204,10 +213,13 @@
             AND ot.order_org LIKE CONCAT( '%', #{orderOrg}, '%' )
         </if>
         <if test="purchaseOrg != null and purchaseOrg != ''">
-            AND vto.purchase_org LIKE CONCAT( '%', #{purchaseOrg}, '%' )
+            AND ot.purchase_org LIKE CONCAT( '%', #{purchaseOrg}, '%' )
         </if>
         <if test="createNo != null and createNo != ''">
-            AND vto.create_no LIKE CONCAT( '%', #{createNo}, '%' )
+            AND ot.create_no LIKE CONCAT( '%', #{createNo}, '%' )
+        </if>
+        <if test="createUsername != null and createUsername != ''">
+            AND ot.create_username LIKE CONCAT( '%', #{createUsername}, '%' )
         </if>
         <if test="checkStartTime != null and checkStartTime != ''">
             AND ot.check_time <![CDATA[ >= ]]> #{checkStartTime}
@@ -239,6 +251,11 @@
         <if test="finishStatus != null">
             AND ot.finish_status = #{finishStatus}
         </if>
+        <if test="studentCheckStatus != null">
+            AND (SELECT COUNT(too.order_sn)
+            FROM top_old_order_goods too
+            WHERE ot.order_sn = too.order_sn AND too.rel_sign_id IS NOT NULL AND too.check_status = #{studentCheckStatus}) > 0
+        </if>
         <if test="tenantId != null and tenantId != ''">
             AND ot.tenant_id = #{tenantId}
         </if>
@@ -320,6 +337,18 @@
         <if test="repairSign != null and repairSign != '' and repairSign == 1">
             AND o.order_id = 0
         </if>
+        <if test="studentCheckStatus != null">
+            AND o.order_id = 0
+        </if>
+        <if test="purchaseOrg != null and purchaseOrg != ''">
+            AND o.order_id = 0
+        </if>
+        <if test="createNo != null and createNo != ''">
+            AND o.order_id = 0
+        </if>
+        <if test="createUsername != null and createUsername != ''">
+            AND o.create_username LIKE CONCAT( '%', #{createUsername}, '%' )
+        </if>
         <if test="invoiceStatus != null and invoiceStatus != ''">
             AND o.invoice_status = #{invoiceStatus}
         </if>