fix(app):

1.修改订单状态类型值

national-motion-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java

@@ -643,15 +643,15 @@ public interface CommonConstant {
    Integer ORDER_TYPE_2 = 2;
 
     /**
-     * 商品类型（1-学校 2-包场 3-无固定场 4-个人赛 5-团队赛 6-课程 7-保险）")
+     * 商品类型（0-学校 1-包场 2-无固定场 3-个人赛 4-团队赛 5-课程 6-保险）")
      */
+    Integer ORDER_PRO_INFO_TYPE_0 = 0;
     Integer ORDER_PRO_INFO_TYPE_1 = 1;
     Integer ORDER_PRO_INFO_TYPE_2 = 2;
     Integer ORDER_PRO_INFO_TYPE_3 = 3;
     Integer ORDER_PRO_INFO_TYPE_4 = 4;
     Integer ORDER_PRO_INFO_TYPE_5 = 5;
     Integer ORDER_PRO_INFO_TYPE_6 = 6;
-    Integer ORDER_PRO_INFO_TYPE_7 = 7;
 
     /**
      * 订单超时未支付延迟任务前缀

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -568,7 +568,7 @@ public class OrderServiceImpl implements IOrderService {
                         appOrderProInfo
                                 .setProductId(priceRule.getId())
                                 .setProductName("学校场地预约")
-                                .setType(CommonConstant.ORDER_PRO_INFO_TYPE_1)
+                                .setType(CommonConstant.ORDER_PRO_INFO_TYPE_0)
                                 .setUseDateStr(date)
                                 .setFrameTimeStr(startTime + "-" + endTime)
                                 .setExpireTime(expireTime)
@@ -617,7 +617,7 @@ public class OrderServiceImpl implements IOrderService {
                         appOrderProInfo.setProductImage(appSitePlace.getCover());
                         appOrderProInfo.setExpireTime(expireTime);
                         appOrderProInfo.setAddress(appSite.getAddress());
-                        appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_2);
+                        appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_1);
                         appOrderProInfo.setOriginalPrice(priceRule.getOriginalPrice());
                         appOrderProInfo.setPrice(priceRule.getSellingPrice());
                         appOrderProInfo.setOrderStatus(0);
@@ -669,7 +669,7 @@ public class OrderServiceImpl implements IOrderService {
                         appOrderProInfo.setProductName(appSitePlace.getName());
                         appOrderProInfo.setProductImage(appSitePlace.getCover());
                         appOrderProInfo.setAddress(appSite.getAddress());
-                        appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_3);
+                        appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_2);
                         appOrderProInfo.setFrameTimeStr(startTime + "-" + endTime);
                         appOrderProInfo.setExpireTime(expireTime);
                         appOrderProInfo.setOriginalPrice(priceRule.getOriginalPrice());
@@ -725,10 +725,10 @@ public class OrderServiceImpl implements IOrderService {
                     appOrderProInfo.setProductName(appGame.getName());
                     appOrderProInfo.setAddress(appGame.getAddress());
                     if (createOrderForm.getOrderType() == 3) {
-                        appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_4);
+                        appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_3);
                     }
                     if (createOrderForm.getOrderType() == 4) {
-                        appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_5);
+                        appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_4);
                     }
                     appOrderProInfo.setFrameTimeStr(appGame.getStartTime() + "-" + appGame.getEndTime());
                     appOrderProInfo.setExpireTime(DateUtil.format(appGameSchedule.getEndTime(), "yyyy-MM-dd HH:mm:ss"));
@@ -797,7 +797,7 @@ public class OrderServiceImpl implements IOrderService {
                     appOrderProInfo.setProductName(appCourse.getName());
                     appOrderProInfo.setAddress(appSite.getAddress());
                     appOrderProInfo.setProductImage(appCourse.getCover());
-                    appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_6);
+                    appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_5);
                     appOrderProInfo.setFrameTimeStr(DateUtil.format(appCourse.getStartTime(), "yyyy-MM-dd") + "-" + DateUtil.format(appCourse.getEndTime(), "MM-dd"));
                     appOrderProInfo.setExpireTime(DateUtil.format(appCourse.getEndTime(), "yyyy-MM-dd"));
                     appOrderProInfo.setOriginalPrice(appCourse.getOriginalPrice());
@@ -915,7 +915,7 @@ public class OrderServiceImpl implements IOrderService {
                 appOrderProInfo.setProductId(insureOrderInfo.getId());
                 appOrderProInfo.setProductName(insureOrderInfo.getInsureName());
                 appOrderProInfo.setProductImage(insureOrderInfo.getCoverImg());
-                appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_7);
+                appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_6);
 
                 appOrderProInfo.setPrice(insureOrderInfo.getMoney());
                 appOrderProInfo.setQuantity(1);
@@ -938,7 +938,7 @@ public class OrderServiceImpl implements IOrderService {
                     .setTicketNo(RandomUtil.randomNumbers(10))
             ;
             appOrderProInfoMapper.insert(appOrderProInfo);
-            if (!Objects.equals(appOrderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_7)) {
+            if (!Objects.equals(appOrderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_6)) {
                 //订单券号记录
                 AppIsin appIsin = new AppIsin();
                 appIsin
@@ -957,7 +957,7 @@ public class OrderServiceImpl implements IOrderService {
                         .setIsinStatus(CommonConstant.ISIN_STATUS_1);
                 appIsinMapper.insert(appIsin);
             }
-            if (Objects.equals(appOrderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_1)) {
+            if (Objects.equals(appOrderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_0)) {
                 appDeviceMapper.selectList(Wrappers.<AppDevice>lambdaQuery().eq(AppDevice::getOrgCode, appOrder.getOrgCode())).forEach(appDevice -> {
                     try {
                         String addUser = addUser(appSitePriceRulesMapper.selectById(appOrderProInfo.getProductId()).getDateOfSale(),

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppOrderProInfo.java

@@ -56,7 +56,7 @@ public class AppOrderProInfo implements Serializable{
     @Excel(name = "商品图片", width = 15)
     @Schema(description = "商品图片")
     private String productImage;
-    @Schema(description = "商品类型（1-学校 2-包场 3-无固定场 4-个人赛 5-团队赛 6-课程 7-保险）")
+    @Schema(description = "商品类型（0-学校 1-包场 2-无固定场 3-个人赛 4-团队赛 5-课程 6-保险）")
     private Integer type;
     @Schema(description = "日期")
     private String useDateStr;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppOrderServiceImpl.java

@@ -132,6 +132,8 @@ public class AppOrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> i
         AppOrderInfoVO appOrderInfoVO = new AppOrderInfoVO();
         //订单编号
         appOrderInfoVO.setOrderCode(appOrder.getOrderCode());
+        //订单类型
+        appOrderInfoVO.setOrderType(appOrder.getOrderType());
         //下单时间
         appOrderInfoVO.setCreateTime(appOrder.getCreateTime());
         //使用地信息

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/AppOrderInfoVO.java

@@ -35,6 +35,9 @@ public class AppOrderInfoVO implements Serializable {
     @Schema(description = "订单状态")
     private Integer orderStatus;
 
+    @Schema(description = "订单类型：0-学校 1-包场 2-无固定场 3-个人赛 4-团队赛 5-课程")
+    private Integer orderType;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "下单时间")