4/10 导入专利

src/main/java/com/example/xiaoshiweixinback/controller/VIPController.java

@@ -3,16 +3,19 @@ package com.example.xiaoshiweixinback.controller;
 import com.example.xiaoshiweixinback.business.common.Constants;
 import com.example.xiaoshiweixinback.business.common.Response;
 import com.example.xiaoshiweixinback.business.common.base.Records;
+import com.example.xiaoshiweixinback.checkLogin.checkLogin;
 import com.example.xiaoshiweixinback.entity.dto.ProductCategoryDTO;
 import com.example.xiaoshiweixinback.entity.vip.ActiveVipDTO;
+import com.example.xiaoshiweixinback.entity.vip.PersonFunctionVO;
+import com.example.xiaoshiweixinback.entity.weixinPay.FunctionRightVO;
+import com.example.xiaoshiweixinback.entity.weixinPay.VipRightsDTO;
 import com.example.xiaoshiweixinback.service.VipService;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-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 org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @Slf4j
 @RequestMapping(Constants.XIAOSHI_WEIXINBACK + "/vip")
@@ -31,7 +34,27 @@ public class VIPController {
     @Operation(summary = "激活会员")
     @PostMapping("/activeVip")
     private Response activeVip(@RequestBody ActiveVipDTO activeVipDTO) {
-        vipService.activateVIP(activeVipDTO);
+        vipService.activateVIP(null);
         return Response.success("激活成功");
     }
+
+    @Operation(summary = "查询会员权益")
+    @GetMapping("/getVipRights")
+    private Response getVipRights() {
+        Records records = new Records();
+        List<FunctionRightVO> functionRightVOList = vipService.getVipRights();
+        records.setData(functionRightVOList);
+
+        return Response.success(records);
+    }
+
+    @Operation(summary = "查询登录人会员权益")
+    @GetMapping("/getPersonRights")
+    private Response getPersonRights() {
+        Records records = new Records();
+        List<PersonFunctionVO> functionRightVOList = vipService.getPersonRights();
+        records.setData(functionRightVOList);
+        return Response.success(records);
+    }
+
 }

src/main/java/com/example/xiaoshiweixinback/entity/vo/TicketVO.java

@@ -55,7 +55,7 @@ public class TicketVO {
     /**
      * 价格
      */
-    private Double price;
+    private Integer price;
 
     private TicketFillInVO ticketFillInVO;
     private TicketPatentApplyVO ticketPatentApplyVO;

src/main/java/com/example/xiaoshiweixinback/service/ProductService.java

@@ -10,6 +10,7 @@ import com.example.xiaoshiweixinback.business.utils.LoginUtils;
 import com.example.xiaoshiweixinback.domain.AssoPersonProduct;
 import com.example.xiaoshiweixinback.domain.AssoProductFile;
 import com.example.xiaoshiweixinback.domain.Product;
+import com.example.xiaoshiweixinback.entity.dto.AssoPersonProductDTO;
 import com.example.xiaoshiweixinback.entity.dto.GetProductDTO;
 import com.example.xiaoshiweixinback.entity.product.ProductAddDTO;
 import com.example.xiaoshiweixinback.entity.product.ProductDTO;
@@ -40,7 +41,6 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> {
     private final AssoProductFileService assoProductFileService;
     private final FileManagerService fileManagerService;
     private final AssoPersonProductService assoPersonProductService;
-
     /**
      * 查询爆款产品
      *
@@ -145,22 +145,23 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> {
         Product product = new Product();
         if (productAddDTO.getId() == null) {
             product = this.addProduct(productAddDTO);
+            AssoPersonProductDTO assoPersonProductDTO =new AssoPersonProductDTO();
+            assoPersonProductDTO.setProductId(product.getId());
+            assoPersonProductDTO.setConcernType(productAddDTO.getConcernType());
+            assoPersonProductService.add(assoPersonProductDTO);
 
         } else {
             product = this.updateProduct(productAddDTO);
         }
         assoProductFileService.addOrUpdateProductFile(product.getId(), productAddDTO.getFileGuids());
         return product.getId();
-
     }
 
     @Transactional(rollbackFor = Exception.class)
     public Product addProduct(ProductAddDTO productAddDTO) {
         Product product = new Product();
         BeanUtils.copyProperties(productAddDTO, product);
-//        PersonnelVO personnelVO = cacheUtil.getLoginUser(loginUtils.getId());
-        PersonnelVO personnelVO = new PersonnelVO();
-        personnelVO.setUuid("1213");
+        PersonnelVO personnelVO = cacheUtil.getLoginUser(LoginUtils.getToken());
         product.setCreateId(personnelVO.getUuid());
         product.setIfCustomized(true);
         product.insert();
@@ -203,6 +204,7 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> {
         getProductDTO.setCurrent(current);
         getProductDTO.setSize(size);
         getProductDTO.setPersonUuid(personnelVO.getUuid());
+        getProductDTO.setConcernTypes(productDTO.getConcernTypes());
             List<ProductVO> productVOs = this.getBaseMapper().getConcernProduct(getProductDTO);
             Long count = this.getBaseMapper().getConcernProductCount(getProductDTO);
             this.loadProduct(productVOs);

src/main/java/com/example/xiaoshiweixinback/service/TicketService.java

@@ -177,6 +177,7 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
                 }
 
                 Integer ticketType = ticket.getTicketType();
+
                 switch (ticketType) {
                     case 1:
                         TicketFillInVO ticketFillInVO = new TicketFillInVO();
@@ -247,6 +248,21 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
         return ticket.getId();
     }
 
+    /**
+     * 更新工单状态
+     *
+     * @param ticketProcessUpDTO
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Integer updateProcess(String uuid,Integer process) {
+        LambdaQueryWrapper<Ticket> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.eq(Ticket::getNum,uuid);
+        Ticket ticket =this.getOne(queryWrapper,false);
+        ticket.setTicketProgress(process);
+        ticket.updateById();
+        return ticket.getId();
+    }
 
     /**
      * 更新价格
@@ -264,7 +280,8 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
         if (!flag) {
             return 0;
         }
-        ticket.setPrice(price);
+        String ps=""+price*100;
+        ticket.setPrice(Integer.parseInt(ps));
         ticket.updateById();
         return ticket.getId();
     }
@@ -278,6 +295,14 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
         return false;
     }
 
+
+    public Ticket getTicketByUUid(String uuid){
+        LambdaQueryWrapper<Ticket> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.eq(Ticket::getNum,uuid);
+        Ticket ticket =this.getOne(queryWrapper);
+        return ticket;
+    }
+
 }
 
 

src/main/resources/application-dev.yml

@@ -51,9 +51,9 @@ spring:
             threadsInheritContextClassLoaderOfInitializingThread: true
           dataSource:
             default:
-              URL: jdbc:mysql://192.168.1.24:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
-              user: root
-              password: rrzTwWAYX8Gxh5JH
+              URL: jdbc:mysql://47.101.137.223:3306:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+              username: root
+              password: TU5x6IeBi7rl
               driver: com.mysql.jdbc.Driver
 
     #数据库方式
@@ -66,8 +66,8 @@ PCSUrl: http://localhost:8871
 #OPSUrl: http://192.168.1.24:5001
 OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8877
-FMSUrl: http://localhost:8801
-VectorUrl: http://192.168.1.6:8000
+FMSUrl: http://localhost:8802
+VectorUrl: http://192.168.1.19:8000
 FileSource: 5
 
 ##################  短信 ####################
@@ -79,4 +79,6 @@ SMS:
 ##################  微信小程序  ####################
 WeChat:
   appId: wxaefb842bd0b93ff0
-  appSecret: 89fe0fb96472548d48f63b2f5c956537
+  appSecret: 89fe0fb96472548d48f63b2f5c956537
+
+Keypath: C:\Users\admin\Desktop\小程序证书\1673179188_20240408_cert\apiclient_key.pem

src/main/resources/application-prodNetIn.yml

@@ -67,7 +67,7 @@ PCSUrl: http://localhost:8871
 OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8877
 FMSUrl: http://localhost:8802
-VectorUrl: http://192.168.1.6:8000
+VectorUrl: http://127.0.0.1:8000
 FileSource: 5
 
 ##################  短信 ####################
@@ -79,4 +79,5 @@ SMS:
 ##################  微信小程序  ####################
 WeChat:
   appId: wxaefb842bd0b93ff0
-  appSecret: 89fe0fb96472548d48f63b2f5c956537
+  appSecret: 89fe0fb96472548d48f63b2f5c956537
+Keypath: apiclient_key.pem

src/main/resources/application.yml

@@ -57,3 +57,5 @@ SMS:
 WeChat:
   appId: wxaefb842bd0b93ff0
   appSecret: 89fe0fb96472548d48f63b2f5c956537
+
+