cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -1052,6 +1052,13 @@ if (now.after(end)&&detailsResponse.getUseStatus()==2) { detailsResponse.setUseStatus(3); } // if (detailsResponse.getUseStatus()!=3){ // if (detailsResponse.getUseStatus()==1 &&now.after(end)){ // detailsResponse.setUseStatus(2); // }else{ // detailsResponse.setUseStatus(2); // } // } } else if (merchandise.getCardType() == 3) { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -1068,6 +1075,13 @@ if (now.after(end)&&detailsResponse.getUseStatus()==2) { detailsResponse.setUseStatus(3); } // if (detailsResponse.getUseStatus()!=3){ // if (detailsResponse.getUseStatus()==1 &&now.after(end)){ // detailsResponse.setUseStatus(2); // }else{ // detailsResponse.setUseStatus(2); // } // } } else if (merchandise.getCardType() == 4) { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -1084,6 +1098,13 @@ if (now.after(end)&&detailsResponse.getUseStatus()==2) { detailsResponse.setUseStatus(3); } // if (detailsResponse.getUseStatus()!=3){ // if (detailsResponse.getUseStatus()==1 &&now.after(end)){ // detailsResponse.setUseStatus(2); // }else{ // detailsResponse.setUseStatus(2); // } // } }
@@ -67,6 +67,8 @@ private StoreClient storeClient; @Autowired private SiteClient siteClient; @Autowired private PointsMerchandiseService pointsMerchandiseService; @@ -234,12 +236,18 @@ UserPointsMerchandise userPointsMerchandise = userPointsMerchandiseService.getById(id); System.err.println("积分商城门票数据"+ userPointsMerchandise); if (userPointsMerchandise!=null){ System.err.println("修改使用状态"); userPointsMerchandise.setUserId(null); userPointsMerchandise.setVerificationTime(new Date()); userPointsMerchandise.setVerifiStoreId(storeId); userPointsMerchandise.setStatus(2); userPointsMerchandiseService.updateById(userPointsMerchandise); PointsMerchandise pointsMerchandise = pointsMerchandiseService.getById(userPointsMerchandise.getPointsMerchandiseId()); if (pointsMerchandise!=null){ if (pointsMerchandise.getCardType()==1){ System.err.println("日卡修改使用状态"); userPointsMerchandise.setUserId(null); userPointsMerchandise.setVerificationTime(new Date()); userPointsMerchandise.setVerifiStoreId(storeId); userPointsMerchandise.setStatus(2); userPointsMerchandiseService.updateById(userPointsMerchandise); } } }else{ System.err.println("未查询到积分商城门票数据"+ id); } cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
@@ -85,6 +85,7 @@ Participant participant = new Participant(); BeanUtils.copyProperties(addParticipant, participant); participant.setHeight(Double.valueOf(addParticipant.getHeight()).intValue()); participant.setWeight(addParticipant.getWeight()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (ToolUtil.isNotEmpty(addParticipant.getBirthday())) { Date parse = sdf.parse(addParticipant.getBirthday()); @@ -110,6 +111,8 @@ Date parse = dateFormat.parse(birthDateStr); tStudent.setBirthday(parse); } tStudent.setHeight(Double.valueOf(addParticipant.getHeight())); tStudent.setWeight(addParticipant.getWeight()); tStudent.setSex(addParticipant.getGender()); tStudent.setIdCard(addParticipant.getIdcard()); tStudent.setState(1); cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageOrder.java
@@ -35,6 +35,11 @@ @TableField("studentIds") private String studentIds; /** * 学员ids */ @TableField("coursePackagePaymentConfigId") private Integer coursePackagePaymentConfigId; /** * 课包id */ @TableField("coursePackageId") cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -882,6 +882,7 @@ } System.err.println("课程报名！！！"); if (paymentCourseVo.getPayType() == 1) {//微信支付 return weChatPaymentCourse(uid, price, paymentCourseVo); } @@ -921,6 +922,7 @@ coursePackageOrder.setAppUserId(uid); coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds()); coursePackageOrder.setCoursePackageId(paymentCourseVo.getId()); coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId()); coursePackageOrder.setPayType(paymentCourseVo.getPayType()); coursePackageOrder.setClassHours(coursePackagePaymentConfig.getClassHours()); coursePackageOrder.setOriginalPrice(paymentCourseVo.getPrice()); @@ -942,6 +944,8 @@ coursePackageOrder.setAppUserId(null); coursePackageOrder.setPayUserType(1); coursePackageOrder.setPayUserId(uid); coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId()); coursePackageOrderService.updateById(coursePackageOrder); } TCoursePackage byId = coursePackageService.getById(paymentCourseVo.getId()); @@ -988,6 +992,8 @@ CoursePackageOrder coursePackageOrder = new CoursePackageOrder(); coursePackageOrder.setCode(code); coursePackageOrder.setAppUserId(uid); coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId()); coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds()); coursePackageOrder.setCoursePackageId(paymentCourseVo.getId()); coursePackageOrder.setPayType(paymentCourseVo.getPayType()); @@ -1010,6 +1016,8 @@ coursePackageOrder.setAppUserId(null); coursePackageOrder.setPayUserType(1); coursePackageOrder.setPayUserId(uid); coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId()); coursePackageOrderService.updateById(coursePackageOrder); } // 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号 @@ -1238,6 +1246,7 @@ coursePackageOrder.setUserCouponId(paymentCourseVo.getCouponId()); coursePackageOrder.setCashPayment(new BigDecimal(paymentPrice)); coursePackageOrder.setPlayPaiCoin(paymentCourseVo.getPrice().intValue()); coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId()); coursePackageOrder.setPayUserType(1); coursePackageOrder.setPayStatus(2); coursePackageOrder.setPayUserId(appUser.getId()); @@ -1271,6 +1280,10 @@ */ @Override public ResultUtil paymentCourseCallback(String code, String trade_no, String attach) throws Exception { System.err.println("进入回调"); System.err.println("code"+ code); System.err.println("trade_no"+ trade_no); System.err.println("attach"+trade_no); CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>() .eq("code", code).eq("state", 1)); if (null == coursePackageOrder1 || coursePackageOrder1.getPayStatus() == 2) { @@ -1283,12 +1296,13 @@ TCoursePackage coursePackage = coursePackageService.getById(coursePackageOrder1.getCoursePackageId()); // 将用户优惠券修改为已使用 Long userCouponId = coursePackageOrder1.getUserCouponId(); userCouponClient.updateUserCouponStatus(userCouponId,coursePackage.getStoreId(),coursePackage.getSiteId()); // CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(attach); // addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig); TCoursePackage byId = coursePackageService.getById(coursePackageOrder1.getCoursePackageId()); Store store = storeClient.queryStoreById(byId.getStoreId()); if (userCouponId!=null){ userCouponClient.updateUserCouponStatus(userCouponId,coursePackage.getStoreId(),coursePackage.getSiteId()); } CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(attach); addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig); // TCoursePackage byId = coursePackageService.getById(coursePackageOrder1.getCoursePackageId()); // Store store = storeClient.queryStoreById(byId.getStoreId()); // moneyOut(trade_no,trade_no,code); return ResultUtil.success(); } @@ -1297,11 +1311,16 @@ /** * 支付成功后添加学员课时数据 * * @param coursePackagePaymentConfig */ @Override public void addCoursePackageOrderStudent(Long coursePackageOrderId, CoursePackagePaymentConfig coursePackagePaymentConfig) { public void addCoursePackageOrderStudent(Long coursePackageOrderId, CoursePackagePaymentConfig coursePackagePaymentConfigServiceById) { System.err.println("添加学员课时数据"); System.err.println("coursePackageOrderId"+coursePackageOrderId); // System.err.println("coursePackagePaymentConfig"+coursePackagePaymentConfig); CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(coursePackageOrderId); CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(coursePackageOrder.getCoursePackagePaymentConfigId()); // 发放优惠券 userCouponClient.sendUserCoupon(new SendCouponReq(coursePackageOrder.getAppUserId(), coursePackagePaymentConfig.getCouponIds())); @@ -1315,6 +1334,7 @@ CoursePackageOrderStudent coursePackageOrderStudent = coursePackageOrderStudentService.getOne(new QueryWrapper<CoursePackageOrderStudent>().eq("studentId", id) .eq("coursePackageId", coursePackageOrder.getCoursePackageId()).eq("state", 1)); if (null == coursePackageOrderStudent) { System.err.println("新增课包订单学员数据"); coursePackageOrderStudent = new CoursePackageOrderStudent(); coursePackageOrderStudent.setAppUserId(coursePackageOrder.getAppUserId()); coursePackageOrderStudent.setStudentId(Integer.valueOf(id)); @@ -1371,6 +1391,7 @@ courseCounsumService.save(courseCounsum1); } } else { System.err.println("更新"); Date useTime = coursePackageOrderStudent.getUseTime(); coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + coursePackagePaymentConfig.getClassHours()); coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() + coursePackagePaymentConfig.getClassHours()); cloud-server-management/src/main/java/com/dsh/course/mapper/GateMapper.java
@@ -21,7 +21,7 @@ @Param("device")String device, @Param("operatorName")String operatorId, @Param("storeName")String storeId, @Param("storeIds")List<Integer> storeIds, @Param("page")Page<Map<String, Object>> page); @Param("storeIds")List<Integer> storeIds ); } cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java
@@ -313,7 +313,7 @@ @ResponseBody public Object listAll(String name,String device,String operatorName, String storeName) { Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage(); List<Integer> storeIds = new ArrayList<>(); if (UserExt.getUser().getObjectType()==2){ // 查询这个运营商下的所有门店 @@ -329,7 +329,7 @@ if (UserExt.getUser().getObjectType()==3){ storeIds.add(UserExt.getUser().getObjectId()); } List<Map<String,Object>> res = gateService.listAll(name,device,operatorName,storeName,storeIds,page); List<Map<String,Object>> res = gateService.listAll(name,device,operatorName,storeName,storeIds); for (Map<String, Object> re : res) { Integer integer = Integer.valueOf(re.get("type").toString()); if (integer==1){ cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IGateService.java
@@ -19,5 +19,5 @@ public interface IGateService extends IService<Gate> { List<Map<String, Object>> listAll(String name, String device, String operatorId, String storeId, List<Integer> storeIds, Page<Map<String, Object>> page); List<Map<String, Object>> listAll(String name, String device, String operatorId, String storeId, List<Integer> storeIds); } cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/GateServiceImpl.java
@@ -22,7 +22,7 @@ private GateMapper gateMapper; @Override public List<Map<String, Object>> listAll(String name, String device, String operatorId, String storeId, List<Integer> storeIds, Page<Map<String, Object>> page) { return gateMapper.listAll(name,device,operatorId,storeId,storeIds,page); String storeId, List<Integer> storeIds) { return gateMapper.listAll(name,device,operatorId,storeId,storeIds); } } cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_add.html
@@ -863,20 +863,20 @@ let vm = this; let ajax = new $ax(Feng.ctxPath + "/tHuiminCard/storeList", (data) => { vm.tableStoreData = data.records; // 使用 vm 替代 this vm.tableStoreData = data.records; vm.storeTotal = data.total; vm.tableStoreLoading = false; console.log('成功获取数据:', vm.tableStoreData); // 验证数据 console.log('成功获取数据:', vm.tableStoreData); }, (data) => { vm.tableStoreLoading = false; Feng.error("请求失败: " + data.responseJSON.message); } ); this.storeForm.pageNum = vm.currentStorePage; this.storeForm.pageSize = vm.pageStoreSize // 正确设置分页参数 this.storeForm.current = vm.currentStorePage; this.storeForm.size = vm.pageStoreSize; ajax.set(this.storeForm); ajax.start(); }, siteList() { @@ -884,21 +884,20 @@ let vm = this; let ajax = new $ax(Feng.ctxPath + "/tHuiminCard/siteList", (data) => { vm.tableSiteData = data.records; // 使用 vm 替代 this vm.tableSiteData = data.records; vm.tableSiteTotal = data.total; vm.tableSiteLoading = false; vm.currentStorePage = data.current; vm.pageStoreSize = data.size; vm.siteTotal = data.total; console.log('成功获取数据:', vm.tableSiteData); // 验证数据 console.log('成功获取数据:', vm.tableSiteData); }, (data) => { vm.tableSiteLoading = false; Feng.error("请求失败: " + data.responseJSON.message); } ); // 正确设置分页参数 this.siteForm.current = vm.currentSitePage; this.siteForm.size = vm.pageSiteSize this.siteForm.size = vm.pageSiteSize; ajax.set(this.siteForm); ajax.start(); }, @@ -1020,11 +1019,11 @@ this.siteList(); }, handleStoreSizeChange(val){ this.pageSiteSize = val; this.pageStoreSize = val; // 修复：原来是错误地设置为 pageSiteSize this.storeList(); }, handleStoreCurrentChange(val){ this.currentSitePage = val; this.currentStorePage = val; // 修复：原来是错误地设置为 currentSitePage this.storeList(); }, }, cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_detail.html
@@ -884,20 +884,20 @@ let vm = this; let ajax = new $ax(Feng.ctxPath + "/tHuiminCard/storeList", (data) => { vm.tableStoreData = data.records; // 使用 vm 替代 this vm.tableStoreData = data.records; vm.storeTotal = data.total; vm.tableStoreLoading = false; console.log('成功获取数据:', vm.tableStoreData); // 验证数据 console.log('成功获取数据:', vm.tableStoreData); }, (data) => { vm.tableStoreLoading = false; Feng.error("请求失败: " + data.responseJSON.message); } ); this.storeForm.pageNum = vm.currentStorePage; this.storeForm.pageSize = vm.pageStoreSize // 修改这里：正确设置分页参数 this.storeForm.current = vm.currentStorePage; this.storeForm.size = vm.pageStoreSize; ajax.set(this.storeForm); ajax.start(); }, siteList() { @@ -905,21 +905,22 @@ let vm = this; let ajax = new $ax(Feng.ctxPath + "/tHuiminCard/siteList", (data) => { vm.tableSiteData = data.records; // 使用 vm 替代 this vm.tableSiteData = data.records; vm.tableSiteTotal = data.total; vm.tableSiteLoading = false; vm.currentStorePage = data.current; vm.pageStoreSize = data.size; vm.siteTotal = data.total; console.log('成功获取数据:', vm.tableSiteData); // 验证数据 console.log('成功获取数据:', vm.tableSiteData); }, (data) => { vm.tableSiteLoading = false; Feng.error("请求失败: " + data.responseJSON.message); } ); // 修改这里：正确设置分页参数 this.siteForm.current = vm.currentSitePage; this.siteForm.size = vm.pageSiteSize this.siteForm.size = vm.pageSiteSize; ajax.set(this.siteForm); ajax.start(); }, @@ -1029,15 +1030,45 @@ this.siteList(); }, handleStoreSizeChange(val){ this.pageSiteSize = val; this.pageStoreSize = val; // 修复：原来是错误地设置为 pageSiteSize this.storeList(); }, handleStoreCurrentChange(val){ this.currentSitePage = val; this.currentStorePage = val; // 修复：原来是错误地设置为 currentSitePage this.storeList(); }, }, created() { let ajax = new $ax(Feng.ctxPath + "/base/region/getProvince", (data) => { this.provinces = data; }, (data) => { Feng.errors("请求失败: " + data.responseJSON.message); } ); ajax.start(); let ajax2 = new $ax(Feng.ctxPath + "/base/region/getCity", (data) => { this.cities = data; }, (data) => { Feng.error("请求失败: " + data.responseJSON.message); } ); ajax2.start(); let ajax3 = new $ax(Feng.ctxPath + "/base/operator/getOperator", (data) => { this.operations = data; }, (data) => { Feng.error("请求失败: " + data.responseJSON.message); } ); ajax3.start(); let editor_1 = UE.getEditor('editor_1'); this.objectType = `${objectType}`
@@ -257,7 +257,10 @@ }, created() { this.changeImg() TCarInfoDlg.goodsPicArray = this.imageUrl2 if (!id) return; for (let i = 0; i < id.split(",").length; i++) { TCarInfoDlg.goodsPicArray.push(id.split(",")[i]); } }, });
@@ -217,9 +217,13 @@ } //提交信息 var ajax = new $ax(Feng.ctxPath + "/operator/addOperator", function(data){ Feng.success("操作成功!"); window.parent.TSite.table.refresh(); TSite.close(); if (data.code == 500){ Feng.error(data.msg); }else{ Feng.success("操作成功!"); window.parent.TSite.table.refresh(); TSite.close(); } },function(data){ Feng.error("操作失败!" + data.responseJSON.message + "!"); });
