submit

run-prod.sh

@@ -1,33 +1,34 @@
 #!/usr/bin/env bash
 # 定义应用组名
-group_name='zhichen'
+group_admin_name='zhichen'
 # 定义应用名称
-app_name='zhichen-saas-api'
+app_admin_name='zhichen-saas-admin'
 # 定义应用版本
-app_version='1.0-SNAPSHOT'
+app_admin_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----'
+echo '----copy jar admin----'
+docker stop ${app_admin_name}
+echo '----stop container admin----'
+docker rm ${app_admin_name}
+echo '----rm container admin----'
+docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
+echo '----rm image admin----'
 # 打包编译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} \
+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 5030:5030 \
+--name ${app_admin_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 \
+-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_api:/logs \
--v /mydata/app/${app_name}/logs:/var/logs \
--d ${group_name}/${app_name}:${app_version}
-echo '----start container----'
+-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----'

zhichen-admin/src/main/java/com/zhichen/controller/order/OrderController.java

@@ -96,6 +96,14 @@ public class OrderController extends BaseController {
         return util.exportExcel(list,"线上订单记录");
     }
 
+    @ApiOperation("导出订单列表")
+    @GetMapping("/kaoqian/exportList")
+    public AjaxResult<OrderKaoqianListExportVo> exportKaoqianList(OrderQueryBo bo) {
+        List<OrderKaoqianListExportVo> list = iOrderService.exportKaoqianList(bo);
+        ExcelUtil<OrderKaoqianListExportVo> util = new ExcelUtil<>(OrderKaoqianListExportVo.class);
+        return util.exportExcel(list,"考前订单记录");
+    }
+
     /**
      * 查询订单列表
      */

zhichen-system/src/main/java/com/zhichen/modules/order/bo/OrderQueryBo.java

@@ -146,4 +146,7 @@ public class OrderQueryBo extends BaseEntity {
 
 	@ApiModelProperty("业务员")
 	private String salesman;
+
+	@ApiModelProperty("外部考前订单标签：0否1是")
+	private Integer beforeSign;
 }

zhichen-system/src/main/java/com/zhichen/modules/order/service/IOrderService.java

@@ -150,4 +150,6 @@ public interface IOrderService extends IService<Order> {
 	List<OrderListVo> withoutOrderList(OrderQueryBo bo);
 
 	List<UserStudyConditionVo> getUserStudyCondition(UserStudyConditionBo bo);
+
+	List<OrderKaoqianListExportVo> exportKaoqianList(OrderQueryBo bo);
 }

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

@@ -3780,6 +3780,29 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return userStudyCondition;
     }
 
+    @Override
+    public List<OrderKaoqianListExportVo> exportKaoqianList(OrderQueryBo bo) {
+        if (Validator.isNotEmpty(bo.getOrderGoodsStatus())) {
+            if (bo.getOrderGoodsStatus() == -1) {
+                Integer[] orderStatus = new Integer[]{-2, -1};
+                bo.setOrderStatus(orderStatus);
+            } else if (bo.getOrderGoodsStatus() == 0) {
+                bo.setGoodsPayStatus(1);
+            } else if (bo.getOrderGoodsStatus() == 1) {
+                //已支付 sql实现
+            } else if (bo.getOrderGoodsStatus() == 2) {
+                bo.setRefundStatus(2);
+            }
+        }
+        List<OrderListVo> orderListVos = this.baseMapper.selectListByBo(bo);
+        List<OrderKaoqianListExportVo> list = new ArrayList<>();
+        for(OrderListVo vo : orderListVos){
+            OrderKaoqianListExportVo item = BeanUtil.toBean(vo,OrderKaoqianListExportVo.class);
+            list.add(item);
+        }
+        return list;
+    }
+
     /**
      * 根据身份证号码判断性别
      *

zhichen-system/src/main/java/com/zhichen/modules/order/vo/OrderKaoqianListExportVo.java

@@ -0,0 +1,76 @@
+package com.zhichen.modules.order.vo;
+
+import com.zhichen.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 订单视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-08
+ */
+@Data
+@ApiModel("订单视图对象")
+public class OrderKaoqianListExportVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订单编号
+     */
+    @Excel(name = "订单编号")
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+    /**
+     * 真实姓名
+     */
+    @Excel(name = "姓名")
+    @ApiModelProperty("真实姓名")
+    private String realname;
+
+    @Excel(name = "手机号码")
+    @ApiModelProperty("手机号码")
+    private String telphone;
+
+    /**
+     * 身份证号
+     */
+    @Excel(name = "身份证号")
+    @ApiModelProperty("身份证号")
+    private String idCard;
+
+
+    @ApiModelProperty("公司名称")
+    private String companyName;
+
+    /**
+     * 商品名称
+     */
+    @Excel(name = "商品名称")
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    /**
+     * 订单价格
+     */
+    @Excel(name = "订单价格")
+    @ApiModelProperty("订单价格")
+    private BigDecimal orderPrice;
+
+    @Excel(name = "专业")
+    @ApiModelProperty("专业")
+    private String categoryName;
+
+
+    @Excel(name = "教育名称")
+    @ApiModelProperty("教育名称")
+    private String educationName;
+
+
+
+}

zhichen-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderFrom" column="order_from"/>
         <result property="status" column="status"/>
         <result property="periodStatus" column="period_status"/>
+        <result property="categoryName" column="category_name"/>
 
         <result property="goodsName" column="goods_name"/>
         <result property="goodsId" column="goods_id"/>
@@ -152,6 +153,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="orderSn != null and orderSn != ''">
             AND o.order_sn = #{orderSn}
         </if>
+        <if test="beforeSign != null and beforeSign != ''">
+            AND og.before_sign = #{beforeSign}
+        </if>
         <if test="orderStatus != null ">
             AND o.order_status in
             <foreach collection="orderStatus" item="item" index="index" open="(" close=")" separator=",">