ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java
@@ -136,6 +136,9 @@ @ApiModelProperty("剩余天数") @TableField(exist = false) private Long lastDays; @ApiModelProperty(value = "单位名称") @TableField(exist = false) private String companyName; } ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
@@ -69,6 +69,11 @@ return R.fail("支付回调:" + cause.getMessage()); } @Override public R vipCallBack(String code, String outTradeNo) { return null; } @Override public R<TActivityVO> activityStatistics(TActivityStatisticsQuery dto) { ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java
@@ -37,6 +37,9 @@ @ApiModelProperty(value = "订单编号") @TableField("code") private String code; @ApiModelProperty(value = "标题") @TableField("title") private String title; @ApiModelProperty(value = "用户id") @TableField("app_user_id") ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderInvoiceVO.java
@@ -17,7 +17,8 @@ @ApiModelProperty(value = "服务费税率") private BigDecimal serviceTariff; @ApiModelProperty(value = "uid") private String uid; @ApiModelProperty(value = "增值服务费税率") private BigDecimal addedServiceTariff; @ApiModelProperty(value = "电费") ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -242,7 +242,7 @@ appUser.setTagName(byIdTag.getData().getName()); } } if (appUser.getVipEndTime().isAfter(LocalDateTime.now())) { if (appUser.getVipEndTime()!=null&&appUser.getVipEndTime().isAfter(LocalDateTime.now())) { //匹配vipMap的值 appUser.setVipName(vipMap.getData().get(appUser.getVipId())); } @@ -250,6 +250,12 @@ R<Long> useOrderCount = chargingOrderClient.useOrderCount(appUser.getId()); appUser.setOrderCount(useOrderCount.getData()); appUser.setUid(appUser.getId().toString()); if (appUser.getCompanyId()!=null){ TCompany data = otherClient.unitDetail(appUser.getCompanyId()).getData(); if (data!=null){ appUser.setCompanyName(data.getName()); } } TAppUserCar one1 = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, appUser.getId()).orderByDesc(BasePojo::getCreateTime).last("limit 1").one(); if (one1!=null){ ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java
@@ -2365,11 +2365,11 @@ "]}"; String hp = num.substring(0, 2);// JSONObject jsonObject = JSONObject.parseObject(jsonStr); JSONArray data = jsonObject.getJSONArray("data"); JSONArray data = jsonObject.getJSONArray("date"); List<CarNumDto> carNumDtos = JSONObject.parseArray(data.toJSONString(), CarNumDto.class); CarNumDto carNumDto = new CarNumDto(); for (CarNumDto carNumDtoTemp : carNumDtos) { if (StringUtils.equals(carNumDto.getCode(), hp)) { if (carNumDtoTemp.getCode().equals(hp)) { carNumDto.setCity(carNumDtoTemp.getCity()); carNumDto.setCode(carNumDtoTemp.getCode()); carNumDto.setProvince(carNumDtoTemp.getProvince()); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
@@ -69,6 +69,7 @@ TVipOrder one = vipOrderService.lambdaQuery().eq(TVipOrder::getCode, code).one(); one.setSerialNumber(outTradeNo); one.setPaymentStatus(2); vipOrderService.updateById(one); GiveVipDto giveVipDto = new GiveVipDto(); giveVipDto.setVipId(one.getVipId()); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
@@ -37,6 +37,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -121,6 +122,7 @@ addOrderInvoice.setAppUserId(userId); addOrderInvoice.setCode(code); addOrderInvoice.setStatus(1); addOrderInvoice.setCreateTime(LocalDateTime.now()); this.save(addOrderInvoice); //获取开票类型 TInvoiceType invoiceType = invoiceTypeClient.getInvoiceType(addOrderInvoice.getInvoiceTypeId()).getData(); @@ -260,6 +262,7 @@ PageInfo<TOrderInvoiceVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize()); List<TOrderInvoiceVO> list = this.baseMapper.pageList(query,pageInfo); for (TOrderInvoiceVO tOrderInvoiceVO : list) { tOrderInvoiceVO.setUid(tOrderInvoiceVO.getId().toString()); List<Long> collect = orderInvoiceDetailService.lambdaQuery().eq(TOrderInvoiceDetail::getOrderInvoiceId, tOrderInvoiceVO.getId()) .eq(TOrderInvoiceDetail::getOrderType, 1).list().stream() .map(TOrderInvoiceDetail::getOrderId).collect(Collectors.toList()); ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -201,7 +201,7 @@ <if test="data.createTime2 != null"> AND o.create_time <= #{data.createTime2} </if> <if test="data.ids != null and data.ids() > 0"> <if test="data.ids != null and data.ids.size() > 0"> AND o.id IN <foreach collection="data.ids" item="id" open="(" separator="," close=")"> #{id} ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
@@ -50,5 +50,10 @@ public R delete(@RequestParam("id") Integer id) { return R.ok(companyService.removeById(id)); } @PostMapping(value = "/unit/detail") public R detail(@RequestParam("id") Integer id) { return R.ok(companyService.getById(id)); } }
@@ -12,6 +12,8 @@ import com.ruoyi.order.api.model.TVipOrder; import com.ruoyi.other.api.domain.TCoupon; import com.ruoyi.other.api.domain.TVip; import com.ruoyi.other.api.feignClient.OtherClient; import com.ruoyi.other.api.feignClient.VipClient; import com.ruoyi.other.mapper.TCouponMapper; import com.ruoyi.other.mapper.TVipMapper; import com.ruoyi.other.service.TVipService; @@ -80,18 +82,30 @@ return pageInfo; } @Resource private VipClient vipClient; @Override public Object vipInfoPay(TVip byId, BigDecimal payMoney, Integer payType,BigDecimal discountMoney,BigDecimal discount,Integer buyType, Long userId) { TAppUser user = appUserClient.getUserById(userId).getData(); //生成会员购买订单 TVipOrder shopOrder = new TVipOrder(); shopOrder.setCode(OrderCodeUtil.getOrderCode("HY")); shopOrder.setType(1); shopOrder.setAppUserId(userId); shopOrder.setType(1); shopOrder.setVipId(byId.getId()); shopOrder.setTitle(byId.getName()); if (buyType==1){ shopOrder.setTitle(byId.getName()+"月卡"); }else if (buyType==2){ shopOrder.setTitle(byId.getName()+"季卡"); }else { shopOrder.setTitle(byId.getName()+"年卡"); } shopOrder.setVipType(buyType); shopOrder.setOrderAmount(payMoney.add(discountMoney)); shopOrder.setDiscount(discount); ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java
@@ -129,6 +129,7 @@ System.err.println("----收到购物回调"); break; case "HY": orderClient.vipCallBack(out_trade_no,outRefundNo); System.err.println("----收到会员回调"); break; } ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml
@@ -24,7 +24,6 @@ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb username: nacos password: nacos ip: 192.168.110.85 config: # 配置中心地址 server-addr: 192.168.110.169:8848
