Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!676

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelTicketController.java

@@ -25,6 +25,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +60,9 @@ public class ChannelTicketController extends BaseApiController {
    */
   @PostMapping("/ticket/list")
   @ApiOperation(value = "盲票组列表" , notes = "获取所有盲票信息")
+  @ApiResponses(
+          @ApiResponse(code = 200, message = "success", response = TicketBoxListVO.class)
+  )
   public TableDataInfo list(@RequestBody TicketBoxParam param) {
     // TODO 根据标签过滤
 
@@ -75,7 +80,9 @@ public class ChannelTicketController extends BaseApiController {
     if (Objects.nonNull(param.getIsPre()) && param.getIsPre() == 1) {
       queryWrapper.gt("t1.pre_price", 0);
     }
-    queryWrapper.eq("t1.type",param.getType());
+    if (Objects.nonNull(param.getType())) {
+      queryWrapper.eq("t1.type",param.getType());
+    }
     if (Objects.nonNull(param.getCategoryId()) && param.getCategoryId() != 0) {
       queryWrapper.eq("t1.category_id",param.getCategoryId());
     }
@@ -107,6 +114,9 @@ public class ChannelTicketController extends BaseApiController {
    * 查看盲票详情
    */
   @PostMapping("/ticket/detail")
+  @ApiResponses(
+          @ApiResponse(code = 200, message = "success", response =  TicketBoxVO.class)
+  )
   @ApiOperation(value = "查看盲票详情" , notes = "根据盲票组ID，获取盲票信息")
   public AjaxResult getInfo(@RequestBody TicketBoxParam param) {
     if (StringUtils.isBlank(param.getBoxId())) {

mp-common/src/main/java/com/qs/mp/common/utils/AESUtil.java

@@ -0,0 +1,49 @@
+package com.qs.mp.common.utils;
+
+import cn.hutool.crypto.symmetric.SymmetricAlgorithm;
+import cn.hutool.crypto.symmetric.SymmetricCrypto;
+import com.qs.mp.common.exception.ServiceException;
+import org.springframework.stereotype.Component;
+
+/**
+ * AES加密工具类
+ * @author Cup
+ * @date 2022/6/6
+ */
+@Component
+public class AESUtil {
+
+
+    private static String key = "oZODJRrW2h3txLey";
+    /**
+     * AES加密
+     * @param str   加密字符串
+     * @return
+     */
+    public static String encrypt(String str) {
+        try {
+            SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, key.getBytes());
+            return aes.encryptHex(str);
+        } catch (Exception e) {
+            throw new ServiceException("AES加密异常，str:" + str, e);
+        }
+    }
+
+
+    /**
+     * AES解密
+     * @param str   加密字符串
+     * @return
+     */
+    public static String decrypt(String str) {
+        try {
+            SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, key.getBytes());
+            return aes.decryptStr(str);
+        } catch (Exception e) {
+            throw new ServiceException("AES加密异常，str:" + str, e);
+
+        }
+    }
+
+
+}

mp-service/src/main/java/com/qs/mp/admin/domain/TicketBox.java

@@ -230,4 +230,9 @@ public class TicketBox implements Serializable {
   private Date updatedTime;
 
 
+  @ApiModelProperty("预付票包价格")
+  public Integer getPkgPrePrice() {
+    return this.prePrice * this.pkgUnit;
+  }
+
 }

mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketBoxListVO.java

@@ -93,6 +93,9 @@ public class TicketBoxListVO {
   @ApiModelProperty("盲票预购价")
   private Integer prePrice;
 
+  @ApiModelProperty("盲票包预购价")
+  private Integer pkgPrePrice;
+
   /**
    * 分佣的销售额百分比
    */