feat：添加小程序判断是否是主账号

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ActivationRecordRes.java

@@ -3,6 +3,7 @@ package com.abi.qms.platform.dto.res;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -20,6 +21,9 @@ import java.util.List;
 @ApiModel
 public class ActivationRecordRes implements Serializable {
 
+    @ApiModelProperty(value = "是否小程序用户主账号 1-是 0-不是")
+    private Integer isMainAccount;
+
     @ApiModelProperty("激活记录列表")
     private List<ActivationRecordBean> activationRecordBeanList;
 
@@ -33,7 +37,7 @@ public class ActivationRecordRes implements Serializable {
     @ApiModel(value = "ActivationRecordRes_ActivationRecordBean")
     public static class ActivationRecordBean implements Serializable {
 
-        @ApiModelProperty("条码序号")
+        @ApiModelProperty(value = "条码序号")
         private String boxCode;
 
         @ApiModelProperty(value = "活动名称")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListQrPackageWxRes.java

@@ -19,6 +19,9 @@ import java.util.List;
 @ApiModel
 public class ListQrPackageWxRes implements Serializable {
 
+    @ApiModelProperty(value = "是否小程序用户主账号 1-是 0-不是")
+    private Integer isMainAccount;
+
     @ApiModelProperty("码包列表")
     private List<QrPackageWxBean> qrPackageWxBeanList;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrBoxMappingServiceImpl.java

@@ -233,11 +233,16 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
 
     @Override
     public ActivationRecordRes getActivationRecord(ActivationRecordReq req) {
+
+        // 是否小程序用户主账号 1-是 0-不是
+        Integer isMainAccount = userUtil.getWholeUser().getIsMainAccount();
+
         ActivationRecordRes res = new ActivationRecordRes();
 
         List<ActivationRecordVO> recordVOList = qrBoxMappingMapper.getActivationRecord(req);
         List<ActivationRecordRes.ActivationRecordBean> beanList = PojoConverterUtils.copyList(recordVOList, ActivationRecordRes.ActivationRecordBean.class);
         res.setActivationRecordBeanList(beanList);
+        res.setIsMainAccount(isMainAccount);
         return res;
     }
 
@@ -261,6 +266,7 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
     public ActivateDetailRes getActivateDetail(ActivateDetailReq req) {
 
         ActivateDetailVo activateDetailVo = qrBoxMappingMapper.getActivateDetail(req.getBoxCode());
+        AssertUtil.isNull(activateDetailVo, "条码序号查询为空");
 
         ActivateDetailRes res = PojoConverterUtils.copy(activateDetailVo, ActivateDetailRes.class);
         return res;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageServiceImpl.java

@@ -920,12 +920,16 @@ public class QrPackageServiceImpl implements QrPackageService {
     @Override
     public ListQrPackageWxRes listWxQrPackage(ListQrPackageWxReq listQrPackageWxReq) {
 
+        // 是否小程序用户主账号 1-是 0-不是
+        Integer isMainAccount = userUtil.getWholeUser().getIsMainAccount();
+
         ListQrPackageWxRes res = new ListQrPackageWxRes();
 
         List<QrPackageWxVO> qrPackageWxVOList = qrPackageMapper.listWxQrPackage(listQrPackageWxReq);
 
         List<ListQrPackageWxRes.QrPackageWxBean> beanList = PojoConverterUtils.copyList(qrPackageWxVOList, ListQrPackageWxRes.QrPackageWxBean.class);
         res.setQrPackageWxBeanList(beanList);
+        res.setIsMainAccount(isMainAccount);
 
         return res;
     }