cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -208,7 +208,7 @@ @ApiImplicitParam(value = "年月", name = "yearMonth", required = true, dataType = "string"), @ApiImplicitParam(value = "页码", name = "pageNum", required = true, dataType = "int"), @ApiImplicitParam(value = "每页数量", name = "pageSize", required = true, dataType = "int"), @ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = true, dataType = "int"), @ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = false, dataType = "int"), }) public ResultUtil<List<RechargesDetail>> wpGoldRechargeRecord(String yearMonth, Integer recordId,Integer pageNum,Integer pageSize){ try { cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/CourseOfStoreVo.java
@@ -33,4 +33,7 @@ @ApiModelProperty(value = "课包课时价格") private double coursePrice; @ApiModelProperty(value = "预约状态") private Integer status; } cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/CourseVenue.java
@@ -35,6 +35,9 @@ @ApiModelProperty(value = "详细说明") String detail; @ApiModelProperty(value = "预约状态：1=未预约，2=已预约") Integer status; } } cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargesDetail.java
@@ -18,5 +18,10 @@ @ApiModelProperty(value = "金额 例如 -90 ") private String consumeAmount; /** * 1充值 2扣除 */ @ApiModelProperty(value = "1充值 2扣除") private Integer recordId; } cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
@@ -18,10 +18,7 @@ import com.dsh.account.model.vo.userBenefitDetail.RechargePayRequest; import com.dsh.account.model.vo.userBenefitDetail.RechargesDetail; import com.dsh.account.service.RechargeRecordsService; import com.dsh.account.util.DateTimeHelper; import com.dsh.account.util.PayMoneyUtil; import com.dsh.account.util.ResultUtil; import com.dsh.account.util.UUIDUtil; import com.dsh.account.util.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -35,6 +32,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; /** * <p> @@ -94,6 +92,7 @@ consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg() ); consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime())); consumeDetail.setConsumeAmount("-" + competition.getAmount()); consumeDetail.setRecordId(2); details.add(consumeDetail); } } @@ -105,6 +104,7 @@ consumeDetail.setConsumeName(RechargeRecordEnum.COURSE_PACKAGE_PURCHASE.getMsg() ); consumeDetail.setConsumeTime(simpleDateFormat.format(tCoursePackagePayment.getInsertTime())); consumeDetail.setConsumeAmount("-" + tCoursePackagePayment.getPlayPaiCoin()); consumeDetail.setRecordId(2); details.add(consumeDetail); } } @@ -116,6 +116,7 @@ consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.name()); consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getInsertTime())); consumeDetail.setConsumeAmount("-" + booking.getPayMoney()); consumeDetail.setRecordId(2); details.add(consumeDetail); } } @@ -132,9 +133,15 @@ consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.name() + "：" + rechargeRecord.getPlayPaiCoins()); consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime())); consumeDetail.setConsumeAmount("+" + rechargeRecord.getAmount()); consumeDetail.setRecordId(1); details.add(consumeDetail); } } if (ToolUtil.isNotEmpty(recordId)){ details = details.stream() .filter(record -> record.getRecordId().equals(recordId)) .collect(Collectors.toList()); } if (details.size() > 0 ){ Collections.sort(details, new Comparator<RechargesDetail>() { @Override cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -218,6 +218,7 @@ couList.setCourseName(courseOfStoreVo.getCourseName()); couList.setTimeStr(courseOfStoreVo.getClassStartTime() + "-" + courseOfStoreVo.getClassEndTime()); couList.setDetail("￥" + courseOfStoreVo.getCoursePrice() + "/会员扣2学时"); couList.setStatus(courseOfStoreVo.getStatus()); courses.add(couList); } courseVenue.setCourses(courses); cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -376,7 +376,24 @@ Coupon coupon = new Coupon(); coupon.setName(dataVo.getCouponName()); coupon.setType(dataVo.getPrescription()); // coupon.setContent(dataVo.getIllustrate()); HashMap<String, Object> stringObjectHashMap = new HashMap<>(); switch (dataVo.getPrescription()){ case 1: stringObjectHashMap.put("num1",dataVo.getCondition()); stringObjectHashMap.put("num2",dataVo.getSubtraction()); coupon.setContent(stringObjectHashMap.toString()); break; case 2: stringObjectHashMap.put("num1",dataVo.getDiscount()); coupon.setContent(stringObjectHashMap.toString()); break; case 3: stringObjectHashMap.put("num1",dataVo.getExperience()); coupon.setContent(stringObjectHashMap.toString()); break; default: break; } coupon.setIllustrate(dataVo.getIllustrate()); coupon.setDistributionMethod(dataVo.getDistributionMethod()); coupon.setRedemptionMethod(dataVo.getExchangeMethod()); cloud-server-activity/src/main/java/com/dsh/activity/model/request/CouponDataVo.java
@@ -39,7 +39,7 @@ /** * 体验券名称 */ BigDecimal experience; String experience; /** * 说明 */ cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -179,6 +179,7 @@ storeVo.setLat(store.getLat()); storeVo.setLon(store.getLon()); storeVo.setCoursePrice(ToolUtil.isEmpty(paymentConfig.getCashPayment()) ? (double) paymentConfig.getPlayPaiCoin():paymentConfig.getCashPayment()); storeVo.setStatus(1); course.add(storeVo); } } cloud-server-course/src/main/java/com/dsh/course/feignclient/model/CourseOfStoreVo.java
@@ -33,4 +33,7 @@ @ApiModelProperty(value = "课包课时价格") private double coursePrice; @ApiModelProperty(value = "预约状态") private Integer status; } cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/CouponClient.java
@@ -35,6 +35,6 @@ boolean updateCouponData(@RequestBody Coupon coupon); @PostMapping("/base/coupon/insertIntoCouponData") void insertIntoData(CouponDataVo dataVo); void insertIntoData(@RequestBody CouponDataVo dataVo); } cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -8,6 +8,7 @@ import com.dsh.course.feignClient.activity.CouponClient; import com.dsh.course.feignClient.activity.model.CouponListOfSearch; import com.dsh.guns.config.UserExt; import com.dsh.guns.core.base.tips.SuccessTip; import com.dsh.guns.core.common.constant.factory.PageFactory; import com.dsh.guns.core.util.ToolUtil; import com.dsh.guns.modular.system.model.CouponDataVo; @@ -182,11 +183,10 @@ */ @RequestMapping(value = "/commitData") public Object commitData(CouponDataVo dataVo){ System.out.println(dataVo); Integer objectType = UserExt.getUser().getObjectType(); dataVo.setUserType(objectType); client.insertIntoData(dataVo); return "SUCCESS"; return new SuccessTip<>(); } } cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js
@@ -265,44 +265,10 @@ // 有效期 var periodOfValidity = $('#periodOfValidity').val(); if (userType === '1'){ // 平台管理员 // 兑换方式:积分+现金 let exchangeMethod = $(':radio[name="exchangeMethod"]:checked').val(); if (exchangeMethod === 1){ } if (exchangeMethod === 2){ var requiredCash = $('#requiredCash').val; } if (exchangeMethod === 3){ } var goodImg = this.goodsCover; var goodImgs = this.goodsPicArray; // 适用范围 全国+指定城市+指定门店 let company = $(':radio[name="company"]:checked').val() if (company === 2){ } if (company === 3){ } commitAJAX(resultData); } if (userType === '2'){ // 城市管理员 } } function commitAJAX(obj){ //提交信息 var ajax = new $ax(Feng.ctxPath + "/tCouponManage/commitData", function (data) { @@ -312,8 +278,27 @@ }, function (data) { Feng.error("添加失败!" + data.responseJSON.message + "!"); }); ajax.set("dataResult", JSON.parse(obj)); ajax.set({ couponName: couponName, prescription: prescription, illustrate: illustrate, distributionMethod: distributionMethod, requiredPoints: requiredPoints, requiredPoints: requiredPoints, userGroup: userGroup, quantityIssued: quantityIssued, pickUpQuantity: pickUpQuantity, periodOfValidity: periodOfValidity, exchangeMethod: exchangeMethod, goodImg: this.goodsCover, goodImgs: this.goodsPicArray, couponName: $('#requiredCash').val, couponName: couponName, couponName: couponName, }); ajax.start(); } /**
