fix 购物车

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/vo/ShoppingCartVo.java

@@ -53,4 +53,10 @@ public class ShoppingCartVo {
 	private Long projectId;
 	@ApiModelProperty("模板类型置")
 	private String templateType;
+	@ApiModelProperty("教育名称")
+	private String educationName;
+	@ApiModelProperty("项目名称")
+	private String projectName;
+	@ApiModelProperty("业务名称")
+	private String businessName;
 }

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

@@ -879,15 +879,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public Boolean updateByEditBo(OrderEditBo bo) {
         Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderId, bo.getOrderId()));
-        if (order.getOrderStatus() != 0) {
+        if (order.getOrderStatus() >0) {
             throw new CustomException("订单无法取消");
         }
 
         Order update = BeanUtil.toBean(bo, Order.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
-
-        if (update.getOrderStatus() == -1) {
+        //待支付手动关闭
+        if (Validator.isNotEmpty(update.getOrderStatus())&&update.getOrderStatus() == -1 &&order.getOrderStatus()==0) {
             update.setCancelTime(DateUtils.getNowTime());
             //手动关闭订单
             OrderVo orderVo = this.queryById(bo.getOrderId());

zhongzheng-system/src/main/resources/mapper/modules/base/ShoppingCartMapper.xml

@@ -25,6 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsType" column="goods_type"/>
         <result property="templateType" column="template_type"/>
         <result property="projectId" column="project_id"/>
+        <result property="educationName" column="education_name"/>
+        <result property="projectName" column="project_name"/>
+        <result property="businessName" column="business_name"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.base.bo.ShoppingCartQueryBo"  resultMap="ShoppingCartVoResult">
@@ -38,12 +41,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             g.`status`,
             g.goods_status,
             g.project_id,
-            ot.type AS template_type
+            ot.type AS template_type,
+            cet.education_name,
+            cpt.project_name,
+            cb.business_name,
         FROM
             shopping_cart s
                 LEFT JOIN goods g ON s.goods_id = g.goods_id
                 LEFT JOIN course_business cb ON g.business_id = cb.id
                 LEFT JOIN order_input_template ot ON cb.template_status = ot.id
+                LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
+                LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
         WHERE
             s.user_id =  #{userId}
         order by s.update_time desc