cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java
@@ -23,6 +23,9 @@ @ApiModelProperty(value = "商品类型") private Integer goodsType; @ApiModelProperty(value = "排序") private Integer sort; } cloud-server-account/src/main/java/com/dsh/account/feignclient/other/model/StoreDetailList.java
@@ -23,7 +23,7 @@ private String storePhone; @ApiModelProperty(value = "门店距离当前位置 的距离") private long storeDistance; private Double storeDistance; @ApiModelProperty(value = "门店营业时间范围") private String storeTime; cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
@@ -96,12 +96,32 @@ List<PaymentCompetition> playPaiFGoldPayRecord = deducClient.getPlayPaiFGoldPayRecord(appUserId); if (playPaiFGoldPayRecord.size() > 0 ){ for (PaymentCompetition competition : playPaiFGoldPayRecord) { if (competition.getPayStatus()==2) { RechargesDetail consumeDetail = new RechargesDetail(); consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg() ); consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime())); consumeDetail.setConsumeAmount("-" + competition.getAmount()); consumeDetail.setRecordId(2); details.add(consumeDetail); }else { RechargesDetail consumeDetail1 = new RechargesDetail(); consumeDetail1.setConsumeName(RechargeRecordEnum.CANCEL_EVENT_REGISTRATION.getMsg()); consumeDetail1.setConsumeTime(simpleDateFormat.format(competition.getRefundTime())); consumeDetail1.setConsumeAmount("+" + competition.getAmount()); consumeDetail1.setRecordId(1); details.add(consumeDetail1); RechargesDetail consumeDetail = new RechargesDetail(); consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg()); consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime())); consumeDetail.setConsumeAmount("-" + competition.getAmount()); consumeDetail.setRecordId(2); details.add(consumeDetail); } } } // 2.课包购买 @@ -301,15 +321,16 @@ records.setOrderNumber(tradeNo); rereMapper.updateById(records); // RechargeRecords rechargeRecords = rereMapper.selectOne(new QueryWrapper<RechargeRecords>() // .eq("code", code)); // if (rechargeRecords.getPayStatus() == 2){ // break; // } // // TAppUser tAppUser = tappMapper.selectById(rechargeRecords.getAppUserId()); // tAppUser.setPlayPaiCoins(null == tAppUser.getPlayPaiCoins()? rechargeRecords.getPlayPaiCoins(): tAppUser.getPlayPaiCoins() +rechargeRecords.getPlayPaiCoins() ); // tappMapper.updateById(tAppUser); RechargeRecords rechargeRecords = rereMapper.selectOne(new QueryWrapper<RechargeRecords>() .eq("code", code)); if (rechargeRecords.getPayStatus() == 2){ TAppUser tAppUser = tappMapper.selectById(rechargeRecords.getAppUserId()); tAppUser.setPlayPaiCoins(null == tAppUser.getPlayPaiCoins()? rechargeRecords.getPlayPaiCoins(): tAppUser.getPlayPaiCoins() +rechargeRecords.getPlayPaiCoins() ); tappMapper.updateById(tAppUser); break; } break; cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -792,6 +792,7 @@ queryStoreList = queryStoreList.stream() .sorted(Comparator.comparing(StoreDetailList::getStoreDistance).reversed()) .collect(Collectors.toList()); }else { queryStoreList = queryStoreList.stream().sorted(Comparator.comparing(o -> o.getStoreDistance())).collect(Collectors.toList()); } cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -300,7 +300,7 @@ List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>() .eq("state", 1) .eq("shelves", 1) .gt("endTime", new Date())); .gt("endTime", new Date()).last("ORDER BY sort desc,insertTime desc")); if (merchandises.size() > 0){ for (PointsMerchandise merchandise : merchandises) { IntegralCommodity integralCommodity = new IntegralCommodity(); @@ -309,6 +309,7 @@ integralCommodity.setCommodityName(merchandise.getName()); integralCommodity.setCommodityPrice(merchandise.getPrice()); integralCommodity.setGoodsType(merchandise.getType()); integralCommodity.setSort(merchandise.getSort()); commodity.add(integralCommodity); } // } @@ -991,9 +992,10 @@ PointDetailsVo detailsVo = new PointDetailsVo(); UserPointsMerchandise byId = upmseService.getById(speMercharsId); List<PointsMerchandiseStore> stores = storeService.list(new QueryWrapper<PointsMerchandiseStore>().eq("pointsMerchandiseId", byId.getPointsMerchandiseId())); if (ToolUtil.isNotEmpty(byId)){ List<PointsMerchandiseStore> stores = storeService.list(new QueryWrapper<PointsMerchandiseStore>().eq("pointsMerchandiseId", byId.getPointsMerchandiseId())); PointsMerchandise pmdsServiceById = pmdsService.getById(byId.getPointsMerchandiseId()); // 2.0 detailsVo.setCardType(pmdsServiceById.getCardType()); @@ -1185,7 +1187,9 @@ detailsVo.setUseType(2); }else { detailsVo.setUseType(1); if (pmdsServiceById.getType()!=2) { detailsVo.setWriteOffTime(simpleDateFormat.format(byId.getVerificationTime())); } if (byId.getStoreId()!=null) { StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId()); detailsVo.setWriteOffName(courseOfStore.getStoreName()); @@ -1246,25 +1250,26 @@ detailsVo.setIntegral(coupon.getIntegral().intValue()); detailsVo.setCash(coupon.getCash()); } // if (coupon.getUseScope() == 1){ // detailsVo.setExchangeAddrType(1); // detailsVo.setBelongs("全国通用"); // }else if (coupon.getUseScope() == 2){ // detailsVo.setExchangeAddrType(2); // List<CouponCity> list = ccityService.list(new LambdaQueryWrapper<CouponCity>() // .eq(CouponCity::getCouponId, coupon.getId())); // if (list.size() > 0){ // detailsVo.setBelongs(list.get(0).getProvince()+"|"+list.get(0).getCity() + "用户可用"); // } // }else { // detailsVo.setExchangeAddrType(3); // List<CouponStore> list = cstoreService.list(new QueryWrapper<CouponStore>() // .eq("couponId",coupon.getId() )); // StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(list.get(0).getStoreId()); // detailsVo.setBelongs(courseOfStore.getStoreName()+"可用"); // } // detailsVo.setStartTime(format.format(coupon.getStartTime())); // detailsVo.setEndTime(format.format(coupon.getEndTime())); if (coupon.getUseScope() == 1){ detailsVo.setExchangeAddrType(1); detailsVo.setBelongs("全国通用"); }else if (coupon.getUseScope() == 2){ detailsVo.setExchangeAddrType(2); List<CouponCity> list = ccityService.list(new LambdaQueryWrapper<CouponCity>() .eq(CouponCity::getCouponId, coupon.getId())); if (list.size() > 0){ detailsVo.setBelongs(list.get(0).getProvince()+"|"+list.get(0).getCity() + "用户可用"); } }else { detailsVo.setExchangeAddrType(3); List<CouponStore> list = cstoreService.list(new QueryWrapper<CouponStore>() .eq("couponId",coupon.getId() )); StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(list.get(0).getStoreId()); detailsVo.setBelongs(courseOfStore.getStoreName()+"可用"); } SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); detailsVo.setStartTime(format.format(coupon.getStartTime())); detailsVo.setEndTime(format.format(coupon.getEndTime())); detailsVo.setContents(coupon.getIllustrate()); detailsVo.setGoodType(4); cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java
@@ -26,4 +26,7 @@ @ApiModelProperty(value = "商品类型") private Integer goodsType; @ApiModelProperty(value = "排序") private Integer sort; } cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
@@ -222,7 +222,7 @@ case 3: packageResp.setAvailable("指定门店可用"); CouponStore couponStore = csMapper.selectOne(new QueryWrapper<CouponStore>() .eq("couponId",coupon.getId())); .eq("couponId",coupon.getId()).last("limit 1")); StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStore.getStoreId()); // packageResp.setCityOrStore(courseOfStore.getStoreName()+","+courseOfStore.getStoreAddr()); packageResp.setCityOrStore(courseOfStore.getStoreName()); cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -186,10 +186,14 @@ // integers.add(2); integers.add(3); ArrayList<Integer> pays = new ArrayList<>(); pays.add(2); pays.add(3); return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>() .in("payType",integers) .eq("appUserId",appUserId) .eq("payStatus",2)); .in("payStatus",pays)); }
@@ -1086,7 +1086,9 @@ } return ResultUtil.success(packagePaymentService.queryRegisteredCourseDetails(coursePayId,appUserId)); }catch (Exception e){ return ResultUtil.runErr(); e.printStackTrace(); throw new RuntimeException(e.getMessage()); // return ResultUtil.runErr(); } } @@ -1418,6 +1420,7 @@ for (CancelledClasses cancelledClasses : voucher) { TCoursePackagePayment coursePackagePayment = packagePaymentService.getById(cancelledClasses.getCoursePackagePaymentId()); coursePackagePayment.setLaveClassHours(coursePackagePayment.getLaveClassHours() + cancelledClasses.getCancelledClassesNumber()); coursePackagePayment.setAppUserId(null); packagePaymentService.updateById(coursePackagePayment); cancelledClassesService.removeById(cancelledClasses.getId()); @@ -2110,9 +2113,14 @@ HashMap<String, Object> weeksOfCourseDetailsList(@RequestBody CourseDetailReq courseDetailReq){ HashMap<String, Object> map = new HashMap<>(); ArrayList<DetailsListVo> objects = new ArrayList<>(); try { // try { String time = courseDetailReq.getTime(); Date parse = new SimpleDateFormat("yyyy-MM-dd").parse(time); Date parse = null; try { parse = new SimpleDateFormat("yyyy-MM-dd").parse(time); } catch (ParseException e) { throw new RuntimeException(e); } int i = cn.hutool.core.date.DateUtil.dayOfWeek(parse)-1; String week = week(i); Store store = sreClient.queryStoreById(courseDetailReq.getStoreId()); @@ -2260,10 +2268,10 @@ map.put("data",objects); return map; } catch (ParseException e) { e.printStackTrace(); } return map; // } catch (ParseException e) { // e.printStackTrace(); // } // return map; } private String week(int i){ cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
@@ -413,7 +413,7 @@ }else { packageResponse.setDiscountPrice(paymentConfig.getCashPayment()); packageResponse.setCostPrice(null); // packageResponse.setCostPrice(null); } Integer cashPayment1 = jsonObject.getInteger("hour"); packageResponse.setFreeClassHours(cashPayment1); cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -870,7 +870,7 @@ if(null != couponId && paymentCourseVo.getPayType() != 3){ UserCoupon userCoupon = userCouponClient.queryUserCouponById(couponId); if(userCoupon.getStatus() == 2){ return ResultUtil.error("优惠券已被核销"); return ResultUtil.error("优惠券已被使用"); } Coupon coupon = couponClient.queryCouponById(userCoupon.getCouponId()); long time = coupon.getEndTime().getTime(); @@ -1155,7 +1155,7 @@ // coursePackagePaymentServiceOne.setLaveClassHours(coursePackagePaymentServiceOne.getLaveClassHours()+coursePackagePaymentConfig.getClassHours()); coursePackagePaymentServiceOne.setCode(code); // coursePackagePaymentServiceOne.setPayStatus(2); // coursePackagePaymentServiceOne.setPayStatus(2); coursePackagePaymentServiceOne.setSalesName("续课"); coursePackagePaymentServiceOne.setAppUserId(null); // coursePackagePaymentServiceOne.setPayStatus(2); @@ -1671,6 +1671,9 @@ break; } int wei = DateUtil.dayOfWeek(date)-1; if (wei == 0){ wei = 7; } if (week.contains(wei)) { for (int i1 = 0; i1 < split.length; i1++) { if (count == can) { cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
@@ -87,7 +87,14 @@ }) public ResultUtil<List<TGameConfig>> queryGameList(Integer siteId, Integer storeId){ try { Integer uid = tokenUtil.getUserIdFormRedis(); AppUser appUser = appUserClient.queryAppUser(uid); List<TGameConfig> tGameConfigs = new ArrayList<>(); if (appUser.getAddUserId()==null) { List<SiteLock> lock = lockService.list(new QueryWrapper<SiteLock>().eq("siteId", siteId)); @@ -96,10 +103,9 @@ 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){ cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -224,7 +224,7 @@ // detailList.setStoreDistance(l); detailList.setStoreTime(store.getStartTime() + "-" + store.getEndTime()); detailList.setStoreInfo(store.getIntroduce()); detailList.setStoreDistance(Long.valueOf(distanceTOKilometer.lastIndexOf("."))); detailList.setStoreDistance(Double.valueOf(distanceTOKilometer)); detailLists.add(detailList); } } cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java
@@ -13,10 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.text.SimpleDateFormat; import java.util.*; /** @@ -59,9 +57,29 @@ String startTime = jsonNode.get("startTime").asText(); String endTime = jsonNode.get("endTime").asText(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); Date start = format.parse(startTime); Date end = format.parse(endTime); Date now = new Date(); if (now.after(start)&&now.before(end)){ if (rulesNode1.isArray()) { int i = 0; for (JsonNode ruleNode : rulesNode1) { i = i + 1; Map<String,Object> de = new HashMap<>(); double money = ruleNode.get("money").asDouble(); Integer usersCoins = ruleNode.get("usersCoins").asInt(); Integer MemberCoins = ruleNode.get("MemberCoins").asInt(); de.put("chargeId",i); de.put("money",money); de.put("usersCoins",usersCoins); de.put("MemberCoins",MemberCoins); responses.add(de); } } }else { if (rulesNode.isArray()) { int i = 0; for (JsonNode ruleNode : rulesNode) { @@ -77,6 +95,7 @@ responses.add(de); } } } } catch (Exception e) { e.printStackTrace(); } cloud-server-other/src/main/java/com/dsh/other/feignclient/account/model/AppUser.java
@@ -115,4 +115,6 @@ private Date insertTime; private Integer points; private Integer addUserId; } cloud-server-other/src/main/java/com/dsh/other/feignclient/model/StoreDetailList.java
@@ -23,7 +23,7 @@ private String storePhone; @ApiModelProperty(value = "门店距离当前位置 的距离") private long storeDistance; private Double storeDistance; @ApiModelProperty(value = "门店营业时间范围") private String storeTime; cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -665,6 +665,14 @@ // return ResultUtil.error("请先进行支付"); siteBooking.setStatus(5); siteBookingService.updateById(siteBooking); AppUser appUser = appUserClient.queryAppUser(siteBooking.getAppUserId()); if(null != siteBooking.getUserCouponId()&&siteBooking.getUserCouponId()!=0){ UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),appUser.getId())); userCoupon.setStatus(1); userCouponClient.updateUserCoupon(userCoupon); } return ResultUtil.success(); } if(siteBooking.getStatus() != 1 && siteBooking.getStatus() != 2){ @@ -704,7 +712,7 @@ siteBooking.setCancelTime(new Date()); siteBooking.setRefundOrderNo(trade_no); siteBookingService.updateById(siteBooking); if(null != siteBooking.getUserCouponId()){ if(null != siteBooking.getUserCouponId()&&siteBooking.getUserCouponId()!=0){ UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),siteBooking.getAppUserId())); userCoupon.setStatus(1); userCouponClient.updateUserCoupon(userCoupon); @@ -727,7 +735,7 @@ siteBooking.setCancelUserId(uid); siteBooking.setCancelTime(new Date()); siteBookingService.updateById(siteBooking); if(null != siteBooking.getUserCouponId()){ if(null != siteBooking.getUserCouponId()&&siteBooking.getUserCouponId()!=0){ UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),appUser.getId())); userCoupon.setStatus(1); userCouponClient.updateUserCoupon(userCoupon);
