Merge branch 'cloud_teacher_active_2021_09'

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -32,6 +32,8 @@ import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.web.WebFeignService;
 import com.yonge.log.model.AuditLogAnnotation;
 
+import javax.servlet.http.HttpServletRequest;
+
 @RestController
 @RequestMapping("news")
 @Api(tags = "资讯服务")
@@ -61,28 +63,33 @@ public class NewsController extends BaseController {
 	@ApiOperation("资讯列表分页查询")
 	@GetMapping(value = "/list")
 	public Object getList(NewsInformationQueryInfo queryInfo) {
-
 		SysUser user = sysUserFeignService.queryUserInfo();
-		
+
 		String clientId = queryInfo.getClientId();
 		
 		if (!StringUtils.equalsIgnoreCase("student", clientId)) {
 			queryInfo.setOrganIdList(webFeignService.queryOrganIdByUserId(user.getId(), clientId));
 		} else {
-			SysConfig cloudTeacherActiveIds = sysConfigService.findByParamName(SysConfigService.CLOUD_TEACHER_ACTIVE_BANNER_IDS);
-			List<Integer> excludeIds = new ArrayList<>();
-			if(Objects.nonNull(cloudTeacherActiveIds)&&StringUtils.isNotBlank(cloudTeacherActiveIds.getParanValue())){
-				excludeIds = Arrays.stream(cloudTeacherActiveIds.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toList());
-			}
 			if (user == null || user.getId() == null) {
 				queryInfo.setOrganId(43);
-				queryInfo.setExcludeIds(excludeIds);
 			} else {
 				queryInfo.setOrganId(user.getOrganId());
-				int memberGroupNum = studentRegistrationDao.countStudentMemberGroupNum(user.getId());
-				if(memberGroupNum>0){
-					queryInfo.setExcludeIds(excludeIds);
-				}
+			}
+		}
+
+		SysConfig cloudTeacherActiveIds = sysConfigService.findByParamName(SysConfigService.CLOUD_TEACHER_ACTIVE_BANNER_IDS);
+		List<Integer> excludeIds = new ArrayList<>();
+		if(Objects.nonNull(cloudTeacherActiveIds)&&StringUtils.isNotBlank(cloudTeacherActiveIds.getParanValue())){
+			excludeIds = Arrays.stream(cloudTeacherActiveIds.getParanValue().split(",")).map(id->Integer.valueOf(id)).collect(Collectors.toList());
+		}
+		if (user == null || user.getId() == null) {
+			queryInfo.setOrganId(43);
+			queryInfo.setExcludeIds(excludeIds);
+		} else {
+			queryInfo.setOrganId(user.getOrganId());
+			int memberGroupNum = studentRegistrationDao.countStudentMemberGroupNum(user.getId());
+			if(memberGroupNum>0){
+				queryInfo.setExcludeIds(excludeIds);
 			}
 		}
 		

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CloudTeacherOrderDao.java

@@ -74,7 +74,7 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
      * @param remark
      * @return
      */
-    List<CloudTeacherOrder> queryActiveOrderPage(@Param("userId") Integer userId,
+    String queryActiveOrderPage(@Param("userId") Integer userId,
                                                  @Param("activeRemark") Integer activeRemark,
                                                  @Param("remark") String remark);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SysCouponCodeDto.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.biz.dal.enums.CouponTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -41,6 +42,15 @@ public class SysCouponCodeDto {
     @ApiModelProperty("优惠码")
     private String code;
 
+    @ApiModelProperty("券类型:FULL_REDUCTION(满减券)，DISCOUNT(折扣券)")
+    private CouponTypeEnum type;
+
+    @ApiModelProperty("面值")
+    private java.math.BigDecimal faceValue;
+
+    @ApiModelProperty("满多少")
+    private java.math.BigDecimal fullAmount;
+
     @ApiModelProperty("订单编号")
     private Long paymentOrderId;
 
@@ -96,6 +106,30 @@ public class SysCouponCodeDto {
         this.phone = phone;
     }
 
+    public CouponTypeEnum getType() {
+        return type;
+    }
+
+    public void setType(CouponTypeEnum type) {
+        this.type = type;
+    }
+
+    public BigDecimal getFaceValue() {
+        return faceValue;
+    }
+
+    public void setFaceValue(BigDecimal faceValue) {
+        this.faceValue = faceValue;
+    }
+
+    public BigDecimal getFullAmount() {
+        return fullAmount;
+    }
+
+    public void setFullAmount(BigDecimal fullAmount) {
+        this.fullAmount = fullAmount;
+    }
+
     public Integer getCouponId() {
         return couponId;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/CloudTeacherOrderService.java

@@ -95,5 +95,5 @@ public interface CloudTeacherOrderService extends BaseService<Long, CloudTeacher
      * @param remark
      * @return
      */
-    List<CloudTeacherOrder> queryActiveOrderPage(Integer userId, Integer activeRemark, String remark);
+    String queryActiveOrderPage(Integer userId, Integer activeRemark, String remark);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CloudTeacherOrderServiceImpl.java

@@ -250,7 +250,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     }
 
     @Override
-    public List<CloudTeacherOrder> queryActiveOrderPage(Integer userId, Integer activeRemark, String remark) {
+    public String queryActiveOrderPage(Integer userId, Integer activeRemark, String remark) {
         return cloudTeacherOrderDao.queryActiveOrderPage(userId,activeRemark,remark);
     }
 }

mec-biz/src/main/resources/config/mybatis/CloudTeacherOrderMapper.xml

@@ -249,7 +249,7 @@
         <include refid="queryCloudTeacherActiveDetailSql"/>
     </select>
     <select id="queryActiveOrderPage" resultMap="CloudTeacherOrder">
-        SELECT cto.* FROM cloud_teacher_order cto
+        SELECT GROUP_CONCAT(DISTINCT cto.remark_) FROM cloud_teacher_order cto
         LEFT JOIN student_payment_order spo ON spo.id_ = cto.order_id_
         WHERE spo.status_ != 'FAILED' AND cto.active_remark_ = #{activeRemark}
         AND cto.student_id_ = #{userId}

mec-biz/src/main/resources/config/mybatis/SysCouponCodeMapper.xml

@@ -31,6 +31,8 @@
 		<result column="coupon_name_" property="couponName"/>
 		<result column="coupon_description_" property="couponDescription"/>
 		<result column="code_" property="code"/>
+		<result column="face_value_" property="faceValue" />
+		<result column="full_amount_" property="fullAmount" />
 		<result column="payment_order_id_" property="paymentOrderId"/>
 		<result column="usage_status_" property="usageStatus"/>
 		<result column="used_time_" property="usedTime"/>
@@ -160,6 +162,8 @@
 			scc.coupon_id_,
 			sc.type_ coupon_type_,
 			sc.name_ coupon_name_,
+		    sc.face_value_,
+		    sc.full_amount_,
 			sc.description_ coupon_description_,
 			scc.code_,
 			scc.payment_order_id_,

mec-student/src/main/java/com/ym/mec/student/controller/SysCouponCodeController.java

@@ -34,4 +34,10 @@ public class SysCouponCodeController extends BaseController {
 		queryInfo.setUserId(sysUser.getId());
 		return succeed(sysCouponCodeService.querySysCouponUseList(queryInfo));
 	}
+
+	@ApiOperation("分页查询")
+	@RequestMapping(value = "queryPageAll")
+	public HttpResponseResult queryPageAll(SysCouponCodeQueryInfo queryInfo) {
+		return succeed(sysCouponCodeService.querySysCouponUseList(queryInfo));
+	}
 }