feat:优惠券

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/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/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_,