fix 字段统一

netflix-dao/src/main/java/com/cyksj/model/views/ExpiredAccountDataView.java

@@ -37,7 +37,7 @@ public class ExpiredAccountDataView {
 	/**
 	 * 类型
 	 */
-	private String type;
+	private String specVal;
 
 	/**
 	 * 用户id
@@ -57,13 +57,18 @@ public class ExpiredAccountDataView {
 	/**
 	 * 用户昵称
 	 */
-	private String nickName;
+	private String nickname;
 
 	/**
 	 * 购买时间
 	 */
 	private Date payTime;
 
+	/**
+	 * 车票开始时间
+	 */
+	private Date startTime;
+
 	/**
 	 * 过期时间
 	 */

netflix-dao/src/main/java/com/cyksj/model/views/UserTicketClearedRecordView.java

@@ -2,7 +2,6 @@ package com.cyksj.model.views;
 
 import com.cyksj.model.entity.UserTicketClearedRecord;
 import com.ejlchina.searcher.bean.DbField;
-import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
@@ -42,6 +41,9 @@ public class UserTicketClearedRecordView {
 	@DbField("ur.account")
 	private String account;
 
+	@DbField("a.password")
+	private String password;
+
 	@DbField("ur.source")
 	private UserTicketClearedRecord.Source source;
 
@@ -60,11 +62,11 @@ public class UserTicketClearedRecordView {
 	@DbField("gdk.spec_val")
 	private String specVal;
 
-	@DbIgnore
+	@DbField("u.nickname")
 	private String nickname;
 
-	@DbIgnore
-	private String headImg;
+	@DbField("u.headimgurl")
+	private String img;
 
 	@DbField("if(cu.id is null,false,true)")
 	private Boolean isCorpWx;

netflix-dao/src/main/resources/mapper/AccountMapper.xml

@@ -9,12 +9,13 @@
                a.password,
                a.us_account,
                a.cn_account,
-               concat(gdk.spec_val,'¥',cast(gdk.price/100 as decimal(10,2))) as 'type',
+               concat(gdk.spec_val,'¥',cast(gdk.price/100 as decimal(10,2))) as 'specVal',
                gr.user_id,
                gr.account as userAccount,
                u.headimgurl as img,
                u.nickname,
                gr.start_time as payTime,
+               gr.start_time,
                gr.expiry_time,
                gr.renew_status,
                gr.is_handle,

netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -82,7 +82,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
                         try {
                             List<Long> skuIds = Jsons.parseList(sku.getBenefitsList(), Long.class);
                             //自购实物 获取权益
-                            isReceivedAll = userRealOrderBenefitsService.getPayRealGoodsBenefits(orderDon.getUserId(), orderDon.getId(), sku.getId(), skuIds);
+                            isReceivedAll = userRealOrderBenefitsService.getPayRealGoodsBenefits(orderDon.getUserId(), orderDon.getId(), skuIds);
                         } catch (Exception e) {
 
                         }

netflix-service/src/main/java/com/cyksj/service/order/UserRealOrderBenefitsService.java

@@ -16,7 +16,7 @@ public interface UserRealOrderBenefitsService {
 	/**
 	 * 获取购买实物权益
 	 */
-	Boolean getPayRealGoodsBenefits(Long userId, Long goodsId, Long skuId, List<Long> skuIds);
+	Boolean getPayRealGoodsBenefits(Long userId, Long orderId, List<Long> skuIds);
 
 	/**
 	 * 扣除实物权益

netflix-service/src/main/java/com/cyksj/service/order/impl/UserRealOrderBenefitsImpl.java

@@ -55,13 +55,13 @@ public class UserRealOrderBenefitsImpl implements UserRealOrderBenefitsService {
 	private final OrderDonMapper orderDonMapper;
 
 	@Override
-	public Boolean getPayRealGoodsBenefits(Long userId, Long orderId, Long goodsId, List<Long> skuIds) {
+	public Boolean getPayRealGoodsBenefits(Long userId, Long orderId, List<Long> skuIds) {
 		Boolean isReceivedAll = true;
 		for (Long skuId : skuIds) {
 			GoodsDonSku goodsDonSku = goodsDonSkuMapper.selectById(skuId);
 			if (goodsDonSku != null) {
 				List<GroupsRelationView> relationViewList = beanSearcher.searchAll(GroupsRelationView.class, MapUtils.builder()
-						.field(GroupsRelationView::getGoodsId, goodsId)
+						.field(GroupsRelationView::getGoodsId, goodsDonSku.getGoodsId())
 						.field(GroupsRelationView::getSkuId, skuId)
 						.field(GroupsRelationView::getUserId, userId)
 						.field(GroupsRelationView::getStatus, GroupsRelation.Status.validity.name())

netflix-web/src/main/java/com/cyksj/config/SaTokenConfigure.java

@@ -1,40 +1,40 @@
-package com.cyksj.config;
-
-import cn.dev33.satoken.interceptor.SaAnnotationInterceptor;
-import cn.dev33.satoken.interceptor.SaRouteInterceptor;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.util.List;
-
-/*
- *项目名: yicang-admin
- *文件名: SaTokenConfigure
- *创建者: JavaZou
- *创建时间:2022/12/19 10:01
- */
-@Configuration
-public class SaTokenConfigure implements WebMvcConfigurer {
-	// 注册拦截器
-	@Override
-	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(new SaRouteInterceptor())
-				.addPathPatterns(List.of("/manage/**", "/manager/**", "/sys/update", "/sys/delete/**"))
-				.excludePathPatterns(List.of("/manage/admin/login",
-						"/manage/admin/get/loginInfo",
-						"/manage/corp/**",
-						"/manage/coupon/corp/send",
-						"/manage/coupon",
-						"/manage/register/wx/refund/notify",
-						"/manage/register/unLimit",
-						"/manage/gzh/msg/notify",
-						"/manage/admin/send/template",
-						"/manage/order/put/status/*",
-						"/manage/user/get/loginInfo",
-						"/manage/user/login"));
-		//注解权限校验
-		registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
-	}
-}
-
+//package com.cyksj.config;
+//
+//import cn.dev33.satoken.interceptor.SaAnnotationInterceptor;
+//import cn.dev33.satoken.interceptor.SaRouteInterceptor;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+//import java.util.List;
+//
+///*
+// *项目名: yicang-admin
+// *文件名: SaTokenConfigure
+// *创建者: JavaZou
+// *创建时间:2022/12/19 10:01
+// */
+//@Configuration
+//public class SaTokenConfigure implements WebMvcConfigurer {
+//	// 注册拦截器
+//	@Override
+//	public void addInterceptors(InterceptorRegistry registry) {
+//		registry.addInterceptor(new SaRouteInterceptor())
+//				.addPathPatterns(List.of("/manage/**", "/manager/**", "/sys/update", "/sys/delete/**"))
+//				.excludePathPatterns(List.of("/manage/admin/login",
+//						"/manage/admin/get/loginInfo",
+//						"/manage/corp/**",
+//						"/manage/coupon/corp/send",
+//						"/manage/coupon",
+//						"/manage/register/wx/refund/notify",
+//						"/manage/register/unLimit",
+//						"/manage/gzh/msg/notify",
+//						"/manage/admin/send/template",
+//						"/manage/order/put/status/*",
+//						"/manage/user/get/loginInfo",
+//						"/manage/user/login"));
+//		//注解权限校验
+//		registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
+//	}
+//}
+//