fix(app):

1.后台订单赛程安排回显信息

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/commercial/CommercialController.java

@@ -23,6 +23,7 @@ import org.jeecg.modules.system.app.form.CoursesVerificationRecordForm;
 import org.jeecg.modules.system.app.service.*;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
 import java.util.List;
 
@@ -230,4 +231,15 @@ public class CommercialController {
     public Result<String> repealVerifyRecord(@Schema(description = "appIsinId") @RequestParam(name = "appIsinId") String appIsinId) throws ParseException {
         return Result.OK(appIsinService.repealVerifyRecord(appIsinId));
     }
+
+    /**
+     * 支付异步通知
+     *
+     * @param request
+     * @return
+     */
+    @PostMapping("/payNotify")
+    public String wechatPayNotify(HttpServletRequest request) {
+        return "支付回调成功";
+    }
 }

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

@@ -411,8 +411,9 @@ public class OrderServiceImpl implements IOrderService {
                         FamilyMembers familyMembers = familyMembersMapper.selectById(id);
 
                         String date = DateUtil.format(priceRule.getDateOfSale(), "yyyy-MM-dd");
-                        String time = DateUtil.format(priceRule.getEndTime(), "HH:mm:ss");
-                        String expireTime = date + " " + time;
+                        String startTime = DateUtil.format(priceRule.getEndTime(), "HH:mm:ss");
+                        String endTime = DateUtil.format(priceRule.getEndTime(), "HH:mm:ss");
+                        String expireTime = date + " " + endTime;
 
                         AppOrderProInfo appOrderProInfo = new AppOrderProInfo();
                         appOrderProInfo
@@ -420,11 +421,11 @@ public class OrderServiceImpl implements IOrderService {
                                 .setProductName("学校场地预约")
                                 .setType(CommonConstant.ORDER_PRO_INFO_TYPE_1)
                                 .setUseDateStr(date)
-                                .setFrameTimeStr(priceRule.getStartTime() + "-" + priceRule.getEndTime())
+                                .setFrameTimeStr(startTime + "-" + endTime)
                                 .setExpireTime(expireTime)
                                 .setOriginalPrice(priceRule.getOriginalPrice())
                                 .setPrice(priceRule.getSellingPrice())
-                                .setOrderStatus(2)
+                                .setOrderStatus(0)
                                 .setQuantity(1)
                                 .setFamilyUserId(id)
                                 .setUserName(familyMembers.getFullName())

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.app.vo.AppGameScheduleVO;
 import org.jeecg.modules.app.vo.AppOrderProInfoVerifyVO;
 import org.jeecg.modules.app.vo.ScanCodeQueryOrderVO;
 import org.jeecg.modules.system.app.dto.AppOrderDTO;
@@ -68,6 +69,9 @@ public class AppOrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> i
     @Resource
     private AppGameMapper appGameMapper;
 
+    @Resource
+    private AppGameScheduleMapper appGameScheduleMapper;
+
     @Resource
     private AppGamePriceRulesMapper appGamePriceRulesMapper;
 
@@ -164,6 +168,12 @@ public class AppOrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> i
             });
             appOrderInfoVO.setIsinList(appIsinVOList);
         }
+        //只有赛事有赛程
+        if (appOrder.getType() == 2) {
+            String gameId = appOrder.getProductIds();
+            List<AppGameScheduleVO> gameScheduleVOList = appGameScheduleMapper.getListVo(gameId);
+            appOrderInfoVO.setGameScheduleVOList(gameScheduleVOList);
+        }
         //课程才有核销记录和优惠信息
         if (appOrder.getType() == 2) {
             BigDecimal sDiscounts = BigDecimal.ZERO;

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.jeecg.modules.app.vo.AppGameScheduleVO;
 import org.jeecg.modules.system.app.dto.VerificationRecordDTO;
 import org.jeecg.modules.system.app.entity.AppOrderProInfo;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -76,4 +77,7 @@ public class AppOrderInfoVO implements Serializable {
 
     @Schema(description = "核销记录")
     private List<VerificationRecordDTO> verificationRecordDTOList;
+
+    @Schema(description = "赛程安排")
+    private List<AppGameScheduleVO> gameScheduleVOList;
 }