|
@@ -1,16 +1,5 @@
|
|
|
package com.diagbot.web;
|
|
|
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
-import javax.validation.Valid;
|
|
|
-
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
-
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.diagbot.annotation.SysLogger;
|
|
|
import com.diagbot.dto.EnShowOptionDTO;
|
|
@@ -36,11 +25,19 @@ import com.diagbot.vo.OpenProductCheckVO;
|
|
|
import com.diagbot.vo.OpenUpOnTrialVO;
|
|
|
import com.diagbot.vo.ProductOrderVO;
|
|
|
import com.diagbot.vo.StartAndendByUserIdVO;
|
|
|
-
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
+import org.springframework.web.bind.annotation.PostMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
import springfox.documentation.annotations.ApiIgnore;
|
|
|
|
|
|
+import javax.validation.Valid;
|
|
|
+import java.util.List;
|
|
|
+
|
|
|
/**
|
|
|
* @author rgb
|
|
|
* @Description 订单产品相关的操作
|
|
@@ -104,7 +101,7 @@ public class ProductOrderController {
|
|
|
public RespDTO<WaitExamOrderCouDTO> waitExamOrderCou() {
|
|
|
return RespDTO.onSuc(productOrderFacade.waitExamOrderCou());
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@ApiOperation(value = "控制台-已开通产品状态校验[by:rengb]", notes = "控制台-已开通产品状态校验")
|
|
|
@PostMapping("/openProductCheck")
|
|
|
@SysLogger("openProductCheck")
|
|
@@ -137,8 +134,8 @@ public class ProductOrderController {
|
|
|
@SysLogger("delInformationAvailable")
|
|
|
@Transactional
|
|
|
public RespDTO delInformationAvailable(@RequestBody OpenedProducts openedProduct) {
|
|
|
- long userId = openedProduct.getUserId();
|
|
|
- long productId = openedProduct.getProductId();
|
|
|
+ long userId = openedProduct.getUserId();
|
|
|
+ long productId = openedProduct.getProductId();
|
|
|
return openedProductsFacade.delInformationAvailables(userId, productId);
|
|
|
}
|
|
|
|
|
@@ -173,28 +170,30 @@ public class ProductOrderController {
|
|
|
@PostMapping("/getInformationAvailableAll")
|
|
|
@SysLogger("getInformationAvailableAll")
|
|
|
@ApiIgnore
|
|
|
- public RespDTO<List<UserAndProdutDTO>> getInformationAvailableByUserIds(@RequestBody List<Long> userIds){
|
|
|
- List<UserAndProdutDTO> UserAndProdutData = openedProductsFacade.getInformationAvailableByUserIds(userIds);
|
|
|
- return RespDTO.onSuc(UserAndProdutData);
|
|
|
+ public RespDTO<List<UserAndProdutDTO>> getInformationAvailableByUserIds(@RequestBody List<Long> userIds) {
|
|
|
+ List<UserAndProdutDTO> UserAndProdutData = openedProductsFacade.getInformationAvailableByUserIds(userIds);
|
|
|
+ return RespDTO.onSuc(UserAndProdutData);
|
|
|
}
|
|
|
+
|
|
|
@ApiOperation(value = "客户中心-查询用户是否有待审核的产品数量[by:wangfeng]", notes = "用户已开通信息")
|
|
|
@PostMapping("/getOrderByUserToAudit")
|
|
|
@SysLogger("getOrderByUserToAudit")
|
|
|
-
|
|
|
- public RespDTO<Integer> getOrderByUserToAudit(@RequestBody Long userId){
|
|
|
- OrderDetailsWapper rderDetails =new OrderDetailsWapper();
|
|
|
- rderDetails.setUserId(userId);
|
|
|
- int sums = orderDetailsFacade.getOrderByUserToAudit(rderDetails);
|
|
|
- return RespDTO.onSuc(sums);
|
|
|
+
|
|
|
+ public RespDTO<Integer> getOrderByUserToAudit(@RequestBody Long userId) {
|
|
|
+ OrderDetailsWapper rderDetails = new OrderDetailsWapper();
|
|
|
+ rderDetails.setUserId(userId);
|
|
|
+ int sums = orderDetailsFacade.getOrderByUserToAudit(rderDetails);
|
|
|
+ return RespDTO.onSuc(sums);
|
|
|
}
|
|
|
+
|
|
|
@ApiOperation(value = "客户中心-查询用户续费数量[by:wangfeng]", notes = "用户已开通信息")
|
|
|
@PostMapping("/getUserWaitingRenewal")
|
|
|
@SysLogger("getUserWaitingRenewal")
|
|
|
-
|
|
|
- public RespDTO<Integer> getUserWaitingRenewal(@RequestBody Long userId){
|
|
|
- UserRenewals userRenewals = new UserRenewals();
|
|
|
- userRenewals.setUserId(userId);
|
|
|
- int userIdSum = userRenewalsFacade.getUserWaitingRenewal(userRenewals);
|
|
|
- return RespDTO.onSuc(userIdSum);
|
|
|
+
|
|
|
+ public RespDTO<Integer> getUserWaitingRenewal(@RequestBody Long userId) {
|
|
|
+ UserRenewals userRenewals = new UserRenewals();
|
|
|
+ userRenewals.setUserId(userId);
|
|
|
+ int userIdSum = userRenewalsFacade.getUserWaitingRenewal(userRenewals);
|
|
|
+ return RespDTO.onSuc(userIdSum);
|
|
|
}
|
|
|
}
|