后台bug修改

44323

2023-11-24 ae9bfd2d66f68a553786ac78b12f4390e65e4e09

 cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java

@@ -5,10 +5,8 @@
import com.alipay.api.response.AlipayTradeQueryResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.SiteLock;
import com.dsh.other.entity.TGame;
import com.dsh.other.entity.TGameConfig;
import com.dsh.other.entity.TGameRecord;
import com.dsh.other.entity.*;
import com.dsh.other.feignclient.CourseRecordClient;
import com.dsh.other.feignclient.account.AppUserClient;
import com.dsh.other.feignclient.account.model.AppUser;
import com.dsh.other.model.QueryMySiteVo;
@@ -27,6 +25,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -54,6 +53,8 @@
    @Autowired
    private PayMoneyUtil payMoneyUtil;

    @Resource
    private CourseRecordClient courseRecordClient;


    @ResponseBody
@@ -86,19 +87,25 @@
    })
    public ResultUtil<List<TGameConfig>> queryGameList(Integer siteId, Integer storeId){
        try {

            Integer uid = tokenUtil.getUserIdFormRedis();
            AppUser appUser = appUserClient.queryAppUser(uid);
            List<TGameConfig> tGameConfigs = new ArrayList<>();

            List<SiteLock> lock = lockService.list(new QueryWrapper<SiteLock>().eq("siteId", siteId));
            if (appUser.getAddUserId()==null) {

            Date now = new Date();
            for (SiteLock siteLock : lock) {
                if (now.after(siteLock.getStartTime())&&now.before(siteLock.getEndTime())){
                    return ResultUtil.error("当前场地已被锁定");


                List<SiteLock> lock = lockService.list(new QueryWrapper<SiteLock>().eq("siteId", siteId));

                Date now = new Date();
                for (SiteLock siteLock : lock) {
                    if (now.after(siteLock.getStartTime()) && now.before(siteLock.getEndTime())) {
                        return ResultUtil.error("当前场地已被锁定");
                    }
                }


            }


            List<TGame> list = gameService.list(new LambdaQueryWrapper<TGame>().eq(TGame::getSiteId, siteId).eq(TGame::getStoreId, storeId).eq(TGame::getState,0));
            if(list.size()>0){
@@ -220,7 +227,7 @@
                                    int min = 5000;
                                    wait += (min * num);
                                    Thread.sleep(wait);
                                    List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("code", code).eq("payType", 3));
                                    List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("number", code).eq("payType", 2));
                                    TGameRecord one = list.get(0);
                                    if(one.getStatus() == 1){
                                        break;
@@ -246,6 +253,15 @@
                                                coursePackagePayment.setStatus(1);
                                                coursePackagePayment.setMoney(config.getCash());
                                                coursePackagePayment.setOrderNo(tradeNo);

                                                CourseCounsum courseCounsum = new CourseCounsum();
//                                                courseCounsum.setPaymentId(paymentId);
                                                courseCounsum.setChangeType(3);
                                                courseCounsum.setInsertTime(new Date());
                                                courseCounsum.setReason("智慧球场;" + config.getCash());
                                                courseCounsum.setAppUserId(uid);
                                                courseRecordClient.save(courseCounsum);

                                            }
                                            gameRecordService.updateBatchById(list);
                                            Integer integer = startGame(uid, gameId, spaceId, sutuId);