1、接入超分功能

2、添加积分系统
3、新增订单查询，积分详细查询

src/main/java/com/ai/da/controller/AliPayController.java

@@ -66,7 +66,7 @@ public class AliPayController {
     }
 
     /**
-     * 申请退款
+     * 不在页面提供申请退款接口
      * @param orderNo
      * @param reason
      * @return

src/main/java/com/ai/da/controller/ConvenientInquiryController.java

@@ -3,9 +3,9 @@ package com.ai.da.controller;
 
 import com.ai.da.common.context.UserContext;
 import com.ai.da.common.response.Response;
-import com.ai.da.mapper.DesignMapper;
-import com.ai.da.mapper.TrialOrderMapper;
-import com.ai.da.mapper.entity.TrialOrder;
+import com.ai.da.mapper.primary.DesignMapper;
+import com.ai.da.mapper.primary.TrialOrderMapper;
+import com.ai.da.mapper.primary.entity.TrialOrder;
 import com.ai.da.model.dto.UserDesignStatisticDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/ai/da/controller/CreditsController.java

@@ -1,6 +1,9 @@
 package com.ai.da.controller;
 
+import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.Response;
+import com.ai.da.mapper.primary.entity.CreditsDetail;
+import com.ai.da.model.dto.QueryIncomeOrExpenditureDTO;
 import com.ai.da.service.CreditsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -8,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 
 @CrossOrigin
 @RestController
@@ -19,10 +23,19 @@ public class CreditsController {
     @Resource
     private CreditsService creditsService;
 
-    @ApiOperation("获取积分")
+    @ApiOperation("获取当前积分")
     @GetMapping("/getCredits")
     public Response<String> getCredits(){
         String credits = creditsService.getCredits();
         return Response.success(credits);
     }
+
+    @ApiOperation("获取积分详细")
+    @PostMapping("/getCreditsDetail")
+    public Response<PageBaseResponse<CreditsDetail>> getCreditsDetail(@Valid @RequestBody QueryIncomeOrExpenditureDTO queryPageByTimeDTO){
+        PageBaseResponse<CreditsDetail> credits = creditsService.queryCreditsDetailsPage(queryPageByTimeDTO);
+        return Response.success(credits);
+    }
+
+
 }

src/main/java/com/ai/da/controller/OrderInfoController.java

@@ -1,16 +1,17 @@
 package com.ai.da.controller;
 
-import com.ai.da.common.context.UserContext;
 import com.ai.da.common.enums.OrderStatusEnum;
+import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.Response;
 import com.ai.da.mapper.primary.entity.OrderInfo;
+import com.ai.da.model.dto.QueryPageByTimeDTO;
 import com.ai.da.service.OrderInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
+import javax.validation.Valid;
 
 @CrossOrigin //开放前端的跨域访问
 @Api(tags = "商品订单管理")
@@ -22,9 +23,9 @@ public class OrderInfoController {
     private OrderInfoService orderInfoService;
 
     @ApiOperation("订单列表")
-    @GetMapping("/list")
-    public Response<List<OrderInfo>> list(){
-        List<OrderInfo> orderByAccountId = orderInfoService.getOrderByAccountId(UserContext.getUserHolder().getId());
+    @PostMapping("/list")
+    public Response<PageBaseResponse<OrderInfo>> list(@Valid @RequestBody QueryPageByTimeDTO queryPageByTimeDTO){
+        PageBaseResponse<OrderInfo> orderByAccountId = orderInfoService.getOrderByPage(queryPageByTimeDTO);
 //        List<OrderInfo> list = orderInfoService.listOrderByCreateTimeDesc();
         return Response.success(orderByAccountId);
     }

src/main/java/com/ai/da/controller/PayPalCheckoutController.java

@@ -26,9 +26,6 @@ public class PayPalCheckoutController {
     @Resource
     private PayPalCheckoutService payPalCheckoutService;
 
-    @Resource
-    private CallBackService callBackService;
-
     @ApiOperation(value = "创建订单")
     @PostMapping(value = "/trade/{amount}")
     public Response<HashMap<String, String>> createOrder(@PathVariable Integer amount, @RequestParam String returnUrl) throws SerializeException {
@@ -39,13 +36,12 @@ public class PayPalCheckoutController {
     @ApiOperation(value = "ipn异步回调")
     @PostMapping(value = "/ipn/back")
     public Response<String> callback(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        Boolean result = callBackService.doGet(request, response);
+        Boolean result = payPalCheckoutService.doPost(request, response);
         if (result){
             return Response.success(200,"success");
         }else {
             return Response.fail(500,"failure");
         }
-//        return payPalCheckoutService.callback(RequestToMapUtil.getParameterMap(request));
     }
 
     @ApiOperation(value = "查询指定订单")
@@ -55,6 +51,7 @@ public class PayPalCheckoutController {
         return Response.success(s);
     }
 
+    /** 不提供退款接口 */
     @ApiOperation("申请退款")
     @PostMapping("/trade/refund/{orderNo}/{reason}")
     public Response<HttpResponse<Refund>> refund(@PathVariable String orderNo, @PathVariable String reason) throws IOException {

src/main/java/com/ai/da/controller/PythonController.java

@@ -7,12 +7,14 @@ import com.ai.da.mapper.primary.entity.Library;
 import com.ai.da.model.dto.ChatFlushDTO;
 import com.ai.da.model.dto.ChatRobotLibraryDTO;
 import com.ai.da.model.dto.ChatSendDTO;
+import com.ai.da.model.dto.SuperResolutionDTO;
 import com.ai.da.model.vo.ChatRobotVO;
 import com.ai.da.model.vo.PythonLibraryVo;
 import com.ai.da.model.vo.SysFileVO;
 import com.ai.da.python.PythonService;
 import com.ai.da.service.ChatRobotService;
 import com.ai.da.service.LibraryService;
+import com.ai.da.service.SuperResolutionService;
 import com.ai.da.service.SysFileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -41,10 +43,12 @@ public class PythonController {
     private SysFileService sysFileService;
     @Resource
     private LibraryService libraryService;
-
     @Resource
     private ChatRobotService chatRobotService;
 
+    @Resource
+    private SuperResolutionService superResolutionService;
+
     @ApiOperation(value = "python服务保存图片到java服务")
     @PostMapping("/saveGeneratePicture")
     public Response<String> upload(@RequestParam("file") MultipartFile file,
@@ -109,4 +113,10 @@ public class PythonController {
         return Response.success(chatRobotService.chatBufferFlush(chatFlushDTO));
     }
 
+    @ApiOperation(value = "超分辨率")
+    @PostMapping("/prepareForSR")
+    public Response<String> superResolution(@RequestBody SuperResolutionDTO superResolutionDTO){
+        return Response.success(superResolutionService.prepareForSR(superResolutionDTO));
+    }
+
 }