server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java
@@ -43,11 +43,11 @@ mess.setPayload(message.getBytes()); try { MqttClientInit.getInstance(config,callBack).publish(topic, mess); return 1; return 0; } catch (Exception e) { //LOGGER.error(e.getLocalizedMessage()); } return 0; return 1; } public static void main(String[] args) { MqttToolService client1 = new MqttToolService(); server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
@@ -46,8 +46,13 @@ WxPayRefundRequest request = new WxPayRefundRequest(); request.setOutTradeNo(refundDTO.getOrderId()); request.setOutRefundNo(refNum); request.setTotalFee(BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString())); request.setRefundFee(BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString())); // request.setTotalFee(BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString())); // request.setRefundFee(BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString())); System.out.println("实际总金额" + BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString())); System.out.println("实际退款金额" + BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString())); request.setTotalFee(1); request.setRefundFee(1); WxPayRefundResult response = WxMiniConfig.wxPayService.refund(request); if ("SUCCESS".equals(response.getReturnCode()) && "SUCCESS".equals(response.getResultCode())) { //存储退款记录 与 流水记录 server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java
@@ -18,7 +18,7 @@ */ @Data @ApiModel("系统行为操作记录表") @TableName("`mqtt_log`") @TableName("mqtt_log") public class MqttLog { @ApiModelProperty(value = "编码") server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
@@ -24,7 +24,7 @@ @ApiModelProperty(value = "主键") @ExcelColumn(name="主键") private Integer id; private String id; @ApiModelProperty(value = "创建人编码") @ExcelColumn(name="创建人编码") server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
@@ -37,8 +37,6 @@ @ApiModelProperty(value = "租赁须知") private String leaseNotice; @ApiModelProperty(value = "计价规则") private String pricingRules; @ApiModelProperty(value = "押金状态：0=未支付押金；1=已支付押金；") private Integer depositStatus = 0; server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
@@ -52,4 +52,7 @@ @ApiModelProperty(value = "超出时间单位") private Integer unitTime; @ApiModelProperty(value = "骑行记录主键") private String rideId; } server/services/src/main/java/com/doumee/service/business/MultifileService.java
@@ -19,14 +19,14 @@ * @param multifile 实体对象 * @return Integer */ Integer create(Multifile multifile); String create(Multifile multifile); /** * 主键删除 * * @param id 主键 */ void deleteById(Integer id); void deleteById(String id); /** * 删除 server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -165,12 +165,14 @@ BeanUtils.copyProperties(repairRequest,bikeRepair); bikeRepair.setCreateDate(new Date()); bikeRepair.setIsdeleted(Constants.ZERO); bikeRepair.setId(Constants.getUUID()); bikeRepairMapper.insert(bikeRepair); //处理附件信息 List<String> stringList = repairRequest.getFileUrlList(); if(!Objects.isNull(stringList)&&stringList.size()>Constants.ZERO){ for (int i = 0; i < stringList.size(); i++) { Multifile multifile = new Multifile(); multifile.setId(Constants.getUUID()); multifile.setCreateDate(new Date()); multifile.setIsdeleted(Constants.ZERO); multifile.setSortnum(i+Constants.ONE); server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -243,7 +243,6 @@ homeResponse.setDeposit(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode())); homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.TIPS).getCode()); homeResponse.setLeaseVideoUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode()); homeResponse.setPricingRules(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PRICING_RULE).getCode()); homeResponse.setStopServeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode()); homeResponse.setIsStopServe(this.checkTemporaryStop()?1:0); homeResponse.setIsBusiness(this.checkBusiness()?0:1); @@ -263,8 +262,10 @@ homeResponse.setDepositStatus(Constants.goodsorderStatus.pay); homeResponse.setGoodsOrderId(goodsorder.getId()); //查询当前骑行状态 MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().eq("member_id", memberId) .orderByDesc(" create_date ") MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().lambda() .eq(MemberRides::getMemberId, memberId) .eq(MemberRides::getOrdreId,goodsorder.getId()) .orderByDesc(MemberRides::getCreateDate) .last(" limit 1 ")); if (!Objects.isNull(memberRides)) { homeResponse.setRideStatus(memberRides.getStatus()); @@ -273,6 +274,7 @@ if(!Objects.isNull(baseParam)){ memberRidesResponse.setBikeType(baseParam.getName()); } memberRidesResponse.setRideId(memberRides.getId()); memberRidesResponse.setRideStartTime(memberRides.getRentDate()); memberRidesResponse.setRideEndTime(memberRides.getBackDate()); memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRidesResponse.getRideStartTime(),memberRidesResponse.getRideEndTime())); @@ -412,7 +414,7 @@ transactions.setCreateDate(new Date()); transactions.setIsdeleted(Constants.ZERO); transactions.setOrderId(goodsorder.getId()); transactions.setMoney(goodsorder.getMoney()); transactions.setMoney(goodsorder.getMoney().subtract(new BigDecimal(refundMoney))); transactions.setType(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getKey()); transactions.setDoneDate(new Date()); transactions.setTitle(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getName()); @@ -593,11 +595,7 @@ int finalFreeTime = freeTime; List<MemberRidesResponse> collect = memberRides.stream().map(s -> { MemberRidesResponse memberRidesResponse = new MemberRidesResponse(); Date endTime =memberRidesResponse.getRideEndTime(); if ( Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(s.getStatus()))){ //如果是骑行中 endTime = new Date(); } Date endTime =s.getBackDate(); int rideTime =DateUtil.betweenMin(s.getRentDate(), endTime); memberRidesResponse.setRideStartTime(s.getRentDate()); memberRidesResponse.setRideEndTime(endTime); @@ -617,7 +615,7 @@ return memberRidesResponse; }).collect(Collectors.toList()); //累计和预算结算金额 RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,false);; RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,false);; if(Constants.formatIntegerNum(goodsorder.getStatus())!= Constants.goodsorderStatus.pay){ //如果非已支付但未结算，使用订单金额 ridesDetailResponse.setAmount(goodsorder.getCloseMoney()); server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -438,6 +438,7 @@ memberRides.setRentSiteId(locks.getSiteId()); memberRides.setRentLockId(locks.getId()); memberRides.setOrdreId(goodsorder.getId()); memberRides.setRentDate(new Date()); memberRides.setBalance(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode())); memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey()); memberRides.setCloseStatus(Constants.ZERO); @@ -476,7 +477,8 @@ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 该车型暂时不能借车操作哦，请更换其他车型重试哦！"); } QueryWrapper<PricingDetail> detail = new QueryWrapper<>(); detail.lambda().eq(PricingDetail::getPricePramId,bike.getParamId()); detail.lambda().eq(PricingDetail::getBikeTypeId,bike.getParamId()); detail.lambda().eq(PricingDetail::getPricePramId,pp.getId()); detail.lambda().eq(PricingDetail::getIsdeleted,Constants.ZERO); detail.lambda().last(" limit 1" ) ; //查询优先级最高（排序码最小的）可用配价方案 @@ -489,6 +491,7 @@ holidays.setHoliday(nowDate); holidays.setIsdeleted(Constants.ZERO); memberRides.setBikeCode(bike.getCode()); memberRides.setParamId(bike.getParamId()); bike.setLastRentDate(new Date()); bike.setStatus(Constants.ONE); bikesMapper.updateById(bike); server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java
@@ -28,13 +28,13 @@ private MultifileMapper multifileMapper; @Override public Integer create(Multifile multifile) { public String create(Multifile multifile) { multifileMapper.insert(multifile); return multifile.getId(); } @Override public void deleteById(Integer id) { public void deleteById(String id) { multifileMapper.deleteById(id); }
@@ -1,5 +1,6 @@ package com.doumee.api.web; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.annotation.LoginRequired; import com.doumee.core.annotation.trace.Trace; import com.doumee.core.constants.Constants; @@ -13,6 +14,7 @@ import com.doumee.dao.business.web.request.RepairRequest; import com.doumee.dao.business.web.response.MemberRidesDetailResponse; import com.doumee.dao.business.web.response.RidesDetailResponse; import com.doumee.dao.system.model.SystemDictData; import com.doumee.service.business.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -55,6 +57,9 @@ @Autowired private MemberRidesService memberRidesService; @Autowired private SystemDictDataBiz systemDictDataBiz; @LoginRequired @ApiOperation(value = "押金支付", notes = "小程序端") @@ -178,4 +183,15 @@ return ApiResponse.success("操作成功"); } @LoginRequired @ApiOperation(value = "获取字典值信息", notes = "小程序端") @GetMapping("/getSysDict") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true), @ApiImplicitParam(paramType = "query", dataType = "String", name = "dicCode", value = "字典编码", required = true), @ApiImplicitParam(paramType = "query", dataType = "String", name = "label", value = "字典数值编码", required = true) }) public ApiResponse<SystemDictData> getSysDict(@RequestParam String dicCode, @RequestParam String label) { return ApiResponse.success("查询成功",systemDictDataBiz.queryByCode(dicCode,label)); } }
