机具申请类型字段调整

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeOrder/ApplyMachineDTO.java

@@ -76,9 +76,9 @@ public class ApplyMachineDTO {
 
 
     /**
-     * 申请类型 1循环申请 0兑换券
+     * 申请类型 0循环申请 1兑换券
      */
-    @Schema(description = "申请类型 1循环申请 0兑换券")
+    @Schema(description = "申请类型 0循环申请 1兑换券")
     @NotNull(message = "申请类型不能为空")
     private Integer applyType;
 

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineApply.java

@@ -136,9 +136,9 @@ public class KxsMachineApply extends Model<KxsMachineApply> implements Serializa
 
 
     /**
-     * 申请类型 1循环申请 0兑换券
+     * 申请类型 0循环申请 1兑换券
      */
-    @Schema(description = "申请类型 1循环申请 0兑换券")
+    @Schema(description = "申请类型 0循环申请 1兑换券")
     private Integer applyType;
 
 

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineApplyDetail.java

@@ -88,9 +88,9 @@ public class KxsMachineApplyDetail extends Model<KxsMachineApplyDetail> implemen
 
 
     /**
-     * 申请类型 1循环申请  0兑换券
+     * 申请类型 0循环申请 1兑换券
      */
-    @Schema(description = "申请类型 1循环申请 0兑换券")
+    @Schema(description = "申请类型 0循环申请 1兑换券")
     private Integer applyType;
 
 

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/userOrder/UserApplyMachineDetailVO.java

@@ -80,9 +80,9 @@ public class UserApplyMachineDetailVO implements Serializable {
 
 
     /**
-     * 申请类型 1循环申请 0兑换券
+     * 申请类型 0循环申请 1兑换券
      */
-    @Schema(description = "申请类型 1循环申请 0兑换券")
+    @Schema(description = "申请类型 0循环申请 1兑换券")
     private Integer applyType;
 
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/constant/enums/MachineOrderEnum.java

@@ -16,8 +16,8 @@ public enum MachineOrderEnum {
     /**
      * 申请类型
      */
-    M_TYPE_SN(0, "兑换券申请"),
-    M_TYPE_RE(1, "循环机申请");
+    M_TYPE_SN(0, "循环机申请"),
+    M_TYPE_RE(1, "兑换券申请");
 
     //状态码
     private final Integer type;

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineApplyServiceImpl.java

@@ -520,6 +520,7 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
 
         UserApplyMachineDetailVO userApplyMachineDetailVO = new UserApplyMachineDetailVO();
         KxsMachineApply order = baseMapper.selectById(id);
+        Optional.ofNullable(order).orElseThrow(() -> new GlobalCustomerException(ErrorTypeEnum.PARAM_ERROR.getDescription()));
         BeanUtils.copyProperties(order, userApplyMachineDetailVO);
         //查询仓库
         KxsWarehouse warehouse = kxsWarehouseMapper.selectById(order.getWarehouseId());

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/admin/camp/CampBonusLogVO.java

@@ -45,7 +45,7 @@ public class CampBonusLogVO implements Serializable {
      * 统计的数量
      */
     @Schema(description = "统计的数量")
-    @ExcelProperty(value = "数量", index = 6)
+    @ExcelProperty(value = "数量", index = 5)
     private Integer sourceNum;
 
 
@@ -75,27 +75,27 @@ public class CampBonusLogVO implements Serializable {
      * 来源创客姓名
      */
     @Schema(description = "来源创客姓名")
-    @ExcelProperty(value = "来源创客姓名", index = 7)
+    @ExcelProperty(value = "来源创客姓名", index = 6)
     private String sourceName;
 
     /**
      * 来源创客编号
      */
     @Schema(description = "来源创客编号")
-    @ExcelProperty(value = "来源创客编号", index = 8)
+    @ExcelProperty(value = "来源创客编号", index = 7)
     private String sourceCode;
 
     /**
      * 组 ID
      */
     @Schema(description = "组 ID")
-    @ExcelProperty(value = "分组编号", index = 4)
+    @ExcelProperty(value = "分组编号", index = 3)
     private String groupId;
 
     /**
      * 组名称
      */
-    @ExcelProperty(value = "小组名称", index = 5)
+    @ExcelProperty(value = "小组名称", index = 4)
     private String groupName;
 
 
@@ -103,7 +103,7 @@ public class CampBonusLogVO implements Serializable {
      * 来源类型 电签券=0 大机券=1 组合包=2 小盟主=3 大盟主=4 pos开机=5 广电卡激活=6 来客吧激活=7 大小盟主兑换券=8
      */
     @Schema(description = "来源类型 电签券=0 大机券=1 组合包=2 小盟主=3 大盟主=4 pos开机=5 广电卡激活=6 来客吧激活=7 大小盟主兑换券=8")
-    @ExcelProperty(value = "来源类型", index = 3,converter = EasyExcelConvert.class)
+    @ExcelProperty(value = "来源类型", converter = EasyExcelConvert.class)
     @EnumFiledConvert(enumMap = "0-电签券,1-大机券,2-组合包,3-小盟主,4-大盟主,5-pos开机,6-广电卡激活,7-来客吧激活,8-大小盟主兑换券",single = false)
     private Integer sourceType;