diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java index cd5d2c4..0b2942b 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java @@ -838,6 +838,23 @@ public class AppVerifyController extends BaseController return toAjax(asDeviceService.bandSn(asDevice)); } + /** + * 根据mac修改sn + */ + @Log(title = "根据mac修改sn", businessType = BusinessType.UPDATESN) + @PostMapping("/updateSn") + public AjaxResult updateSn(String sn,String mac,Long hardwareVersionId) + { + logger.info("根据mac修改sn：【sn="+sn+"】，【mac="+mac+"】,【hardwareVersionId="+hardwareVersionId+"】"); + AsDevice asDevice = new AsDevice(); + asDevice.setSn(sn); + asDevice.setMac(mac); + asDevice.setHardwareVersionId(hardwareVersionId); + asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NOT_BAND); + asDevice.setCreateTime(DateUtils.getNowDate()); + return toAjax(asDeviceService.updateSn(asDevice)); + } + /** * 根据userId获取areaId(管理员属于哪个运营区) */ diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelController.java new file mode 100644 index 0000000..c49397c --- /dev/null +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelController.java @@ -0,0 +1,86 @@ +package com.ruoyi.web.controller.system; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.ValidGroup; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.Channel; +import com.ruoyi.system.domain.ChannelQuery; +import com.ruoyi.system.domain.ChannelVO; +import com.ruoyi.system.service.EtChannelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 充值渠道Controller + * + * @author ruoyi + * @date 2024-04-15 + */ +@RestController +@RequestMapping("/system/channel") +public class EtChannelController extends BaseController +{ + @Autowired + private EtChannelService smEtChannelService; + + /** + * 查询充值渠道列表 + */ + @PreAuthorize("@ss.hasPermi('system:channel:list')") + @GetMapping("/list") + public TableDataInfo list(ChannelQuery smChannel) + { + startPage(); + List list = smEtChannelService.selectSmChannelList(smChannel); + return getDataTable(list); + } + + /** + * 导出充值渠道列表 + */ + @PreAuthorize("@ss.hasPermi('system:channel:export')") + @Log(title = "充值渠道", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ChannelQuery smChannel) + { + List list = smEtChannelService.selectSmChannelList(smChannel); + ExcelUtil util = new ExcelUtil(ChannelVO.class); + util.exportExcel(response, list, "充值渠道数据"); + } + + /** + * 获取充值渠道详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:channel:query')") + @GetMapping(value = "/{channelId}") + public AjaxResult getInfo(@PathVariable("channelId") Long channelId) + { + return success(smEtChannelService.selectSmChannelByChannelId(channelId)); + } + + /** + * 修改充值渠道 + */ + @PreAuthorize("@ss.hasPermi('system:channel:edit')") + @Log(title = "充值渠道", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody @Validated(ValidGroup.Update.class) Channel form) + { + Channel channel = new Channel(); + channel.setChannelId(form.getChannelId()); + channel.setEnabled(form.getEnabled()); + channel.setCostRate(form.getCostRate()); + channel.setPicture(form.getPicture()); + return toAjax(smEtChannelService.updateSmChannel(channel)); + } + +} diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelWithdrawController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelWithdrawController.java new file mode 100644 index 0000000..68fd8b6 --- /dev/null +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtChannelWithdrawController.java @@ -0,0 +1,101 @@ +package com.ruoyi.web.controller.system; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.ChannelWithdraw; +import com.ruoyi.system.domain.ChannelWithdrawQuery; +import com.ruoyi.system.domain.ChannelWithdrawVO; +import com.ruoyi.system.service.EtChannelWithdrawService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 提现渠道Controller + * + * @author ruoyi + * @date 2024-08-02 + */ +@RestController +@RequestMapping("/ss/channelWithdraw") +public class EtChannelWithdrawController extends BaseController +{ + @Autowired + private EtChannelWithdrawService etChannelWithdrawService; + + /** + * 查询提现渠道列表 + */ + @PreAuthorize("@ss.hasPermi('ss:channelWithdraw:list')") + @GetMapping("/list") + public TableDataInfo list(ChannelWithdrawQuery query) + { + startPage(); + startOrderBy(); + List list = etChannelWithdrawService.selectChannelWithdrawList(query); + return getDataTable(list); + } + + /** + * 导出提现渠道列表 + */ + @PreAuthorize("@ss.hasPermi('ss:channelWithdraw:export')") + @Log(title = "提现渠道", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ChannelWithdrawQuery query) + { + List list = etChannelWithdrawService.selectChannelWithdrawList(query); + ExcelUtil util = new ExcelUtil(ChannelWithdrawVO.class); + util.exportExcel(response, list, "提现渠道数据"); + } + + /** + * 获取提现渠道详细信息 + */ + @PreAuthorize("@ss.hasPermi('ss:channelWithdraw:query')") + @GetMapping(value = "/{channelId}") + public AjaxResult getInfo(@PathVariable("channelId") Long channelId) + { + return success(etChannelWithdrawService.selectChannelWithdrawByChannelId(channelId)); + } + + /** + * 新增提现渠道 + */ + @PreAuthorize("@ss.hasPermi('ss:channelWithdraw:add')") + @Log(title = "提现渠道", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ChannelWithdraw channelWithdraw) + { + return toAjax(etChannelWithdrawService.insertChannelWithdraw(channelWithdraw)); + } + + /** + * 修改提现渠道 + */ + @PreAuthorize("@ss.hasPermi('ss:channelWithdraw:edit')") + @Log(title = "提现渠道", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ChannelWithdraw channelWithdraw) + { + return toAjax(etChannelWithdrawService.updateChannelWithdraw(channelWithdraw)); + } + + /** + * 删除提现渠道 + */ + @PreAuthorize("@ss.hasPermi('ss:channelWithdraw:remove')") + @Log(title = "提现渠道", businessType = BusinessType.DELETE) + @DeleteMapping("/{channelIds}") + public AjaxResult remove(@PathVariable Long[] channelIds) + { + return toAjax(etChannelWithdrawService.deleteChannelWithdrawByChannelIds(channelIds)); + } +} diff --git a/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java index c5d453d..b872587 100644 --- a/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java @@ -177,6 +177,11 @@ public enum BusinessType * 绑定 */ BAND, + + /** + * 根据mac修改sn + */ + UPDATESN, /** * 实名认证 */ diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java b/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java new file mode 100644 index 0000000..3cdd8a1 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/Channel.java @@ -0,0 +1,56 @@ +package com.ruoyi.system.domain; + +import com.fasterxml.jackson.annotation.JsonView; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +//import com.ruoyi.common.core.domain.JsonViewProfile; +import com.ruoyi.common.core.domain.ValidGroup; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import java.math.BigDecimal; + +/** + * 充值渠道对象 et_channel + * + * @author ruoyi + * @date 2024-04-15 + */ +@Data +public class Channel extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ +// @JsonView(JsonViewProfile.App.class) + private Long channelId; + + /** 渠道名称 */ + @Excel(name = "渠道名称") +// @JsonView(JsonViewProfile.App.class) + private String name; + + /** 是否启用 */ + @Excel(name = "是否启用") + private Boolean enabled; + +// /** 服务费费率% */ +// @Excel(name = "服务费费率%") +// @Min(value = 0, message = "服务费费率不允许低于0", groups = {ValidGroup.Update.class}) +// private BigDecimal serviceRate; + + /** 成本率% */ + @Excel(name = "成本率%") + @Min(value = 0, message = "成本率不允许低于0", groups = {ValidGroup.Update.class}) + private BigDecimal costRate; + +// @Excel(name = "服务费类型") +// @ApiModelProperty("服务费类型") +// private String serviceType; + + @ApiModelProperty("渠道图片") +// @JsonView(JsonViewProfile.App.class) + private String picture; + +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelQuery.java b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelQuery.java new file mode 100644 index 0000000..d751588 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelQuery.java @@ -0,0 +1,17 @@ +package com.ruoyi.system.domain; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author wjh + * 2024/5/5 + */ +@Data +public class ChannelQuery extends Channel { + + @ApiModelProperty("渠道ID列表") + private List channelIds; +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelVO.java b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelVO.java new file mode 100644 index 0000000..4917c5f --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelVO.java @@ -0,0 +1,11 @@ +package com.ruoyi.system.domain; + +import lombok.Data; + +/** + * @author wjh + * 2024/7/28 + */ +@Data +public class ChannelVO extends Channel{ +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java new file mode 100644 index 0000000..4a4f0ca --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdraw.java @@ -0,0 +1,60 @@ +package com.ruoyi.system.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import java.math.BigDecimal; + +/** + * 提现渠道对象 et_channel_withdraw + * + * @author ruoyi + * @date 2024-08-02 + */ +@Data +public class ChannelWithdraw extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + private Long channelId; + + @Excel(name = "渠道名称") + @ApiModelProperty("渠道名称") + private String name; + + @Excel(name = "对应账户类型") + @ApiModelProperty("对应账户类型") + private String accountType; + + @Excel(name = "服务费收取类型") + @ApiModelProperty("服务费收取类型") + private String serviceType; + + @Excel(name = "服务费") + @ApiModelProperty("服务费") + private BigDecimal serviceRate; + + @Excel(name = "是否启用") + @ApiModelProperty("是否启用") + private Boolean enabled; + + @Excel(name = "渠道成本率") + @ApiModelProperty("渠道成本率") + private BigDecimal costRate; + + @Excel(name = "图片") + @ApiModelProperty("图片") + private String picture; + + @ApiModelProperty("单笔最低提现金额") + @Min(value = 0, message = "单笔最低提现金额不能小于0") + private BigDecimal minAmount; + + @ApiModelProperty("单笔最高提现金额") + @Min(value = 0, message = "单笔最高提现金额不能小于0") + private BigDecimal maxAmount; + +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdrawQuery.java b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdrawQuery.java new file mode 100644 index 0000000..fbfb8d8 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdrawQuery.java @@ -0,0 +1,18 @@ +package com.ruoyi.system.domain; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author wjh + * 2024/8/2 + */ +@Data +public class ChannelWithdrawQuery extends ChannelWithdraw{ + + @ApiModelProperty("账户类型列表") + private List accountTypes; + +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdrawVO.java b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdrawVO.java new file mode 100644 index 0000000..fd5780c --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/ChannelWithdrawVO.java @@ -0,0 +1,11 @@ +package com.ruoyi.system.domain; + +import lombok.Data; + +/** + * @author wjh + * 2024/8/2 + */ +@Data +public class ChannelWithdrawVO extends ChannelWithdraw{ +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCommandLog.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCommandLog.java index 0b4cae1..e9761c7 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCommandLog.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCommandLog.java @@ -50,6 +50,14 @@ public class EtCommandLog extends BaseEntity @Excel(name = "纬度") private String latitude; + /** 手机经度 */ + @Excel(name = "经度") + private String lon; + + /** 手机纬度 */ + @Excel(name = "纬度") + private String lat; + /** 回调状态 */ @Excel(name = "回调状态") private String callStatus; diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java index f901ca8..5d976d5 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java @@ -312,4 +312,22 @@ public class EtOrder extends BaseEntity @Excel(name = "优惠券对象") private EtCoupon coupon; + /** 手续费 */ + @Excel(name = "手续费") + private BigDecimal handlingCharge; + + /** 平台服务费 */ + @Excel(name = "平台服务费") + private BigDecimal platformServiceFee; + + /** 运营商分账(到账金额) */ + @Excel(name = "运营商分账(到账金额)") + private BigDecimal operatorDividend; + + /** 成本 */ + @Excel(name = "成本") + @TableField(exist = false) + private BigDecimal cost; + + } diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/AsDeviceMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/AsDeviceMapper.java index 8a6528a..94f5c26 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/mapper/AsDeviceMapper.java +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/AsDeviceMapper.java @@ -90,6 +90,14 @@ public interface AsDeviceMapper extends BaseMapper */ public int updateAsDeviceBySn(AsDevice asDevice); + /** + * 根据MAC修改设备 + * + * @param asDevice 设备 + * @return 结果 + */ + public int updateAsDeviceByMac(AsDevice asDevice); + /** * 删除设备 * diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelMapper.java new file mode 100644 index 0000000..d38e5d5 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelMapper.java @@ -0,0 +1,65 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.system.domain.Channel; +import com.ruoyi.system.domain.ChannelQuery; +import com.ruoyi.system.domain.ChannelVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 充值渠道Mapper接口 + * + * @author ruoyi + * @date 2024-04-15 + */ +public interface EtChannelMapper +{ + /** + * 查询充值渠道 + * + * @param channelId 充值渠道主键 + * @return 充值渠道 + */ + public ChannelVO selectSmChannelByChannelId(Long channelId); + + /** + * 查询充值渠道列表 + * + * @param smChannel 充值渠道 + * @return 充值渠道集合 + */ + public List selectSmChannelList(@Param("query") ChannelQuery smChannel); + + /** + * 新增充值渠道 + * + * @param channel 充值渠道 + * @return 结果 + */ + public int insertSmChannel(Channel channel); + + /** + * 修改充值渠道 + * + * @param channel 充值渠道 + * @return 结果 + */ + public int updateSmChannel(@Param("data") Channel channel); + + /** + * 删除充值渠道 + * + * @param channelId 充值渠道主键 + * @return 结果 + */ + public int deleteSmChannelByChannelId(Long channelId); + + /** + * 批量删除充值渠道 + * + * @param channelIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSmChannelByChannelIds(Long[] channelIds); +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelWithdrawMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelWithdrawMapper.java new file mode 100644 index 0000000..209f494 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtChannelWithdrawMapper.java @@ -0,0 +1,65 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.system.domain.ChannelWithdraw; +import com.ruoyi.system.domain.ChannelWithdrawQuery; +import com.ruoyi.system.domain.ChannelWithdrawVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 提现渠道Mapper接口 + * + * @author ruoyi + * @date 2024-08-02 + */ +public interface EtChannelWithdrawMapper +{ + /** + * 查询提现渠道 + * + * @param channelId 提现渠道主键 + * @return 提现渠道 + */ + public ChannelWithdrawVO selectChannelWithdrawByChannelId(Long channelId); + + /** + * 查询提现渠道列表 + * + * @param query 提现渠道 + * @return 提现渠道集合 + */ + public List selectChannelWithdrawList(@Param("query") ChannelWithdrawQuery query); + + /** + * 新增提现渠道 + * + * @param channelWithdraw 提现渠道 + * @return 结果 + */ + public int insertChannelWithdraw(ChannelWithdraw channelWithdraw); + + /** + * 修改提现渠道 + * + * @param channelWithdraw 提现渠道 + * @return 结果 + */ + public int updateChannelWithdraw(@Param("data") ChannelWithdraw channelWithdraw); + + /** + * 删除提现渠道 + * + * @param channelId 提现渠道主键 + * @return 结果 + */ + public int deleteChannelWithdrawByChannelId(Long channelId); + + /** + * 批量删除提现渠道 + * + * @param channelIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteChannelWithdrawByChannelIds(Long[] channelIds); +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/typehandler/NonNullDecimalTypeHandler.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/typehandler/NonNullDecimalTypeHandler.java new file mode 100644 index 0000000..36cd42c --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/typehandler/NonNullDecimalTypeHandler.java @@ -0,0 +1,43 @@ +package com.ruoyi.system.mapper.typehandler; + +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; + +import java.math.BigDecimal; +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +/** + * 非空BigDecimal类型处理器，为空时，返回0 + * @author wjh + * 2024/3/30 + */ +public class NonNullDecimalTypeHandler extends BaseTypeHandler { + + @Override + public void setNonNullParameter(PreparedStatement ps, int i, BigDecimal parameter, JdbcType jdbcType) throws SQLException { + ps.setBigDecimal(i, parameter); + } + + @Override + public BigDecimal getNullableResult(ResultSet rs, String columnName) + throws SQLException { + BigDecimal data = rs.getBigDecimal(columnName); + return data == null ? BigDecimal.ZERO : data; + } + + @Override + public BigDecimal getNullableResult(ResultSet rs, int columnIndex) throws SQLException { + BigDecimal data = rs.getBigDecimal(columnIndex); + return data == null ? BigDecimal.ZERO : data; + } + + @Override + public BigDecimal getNullableResult(CallableStatement cs, int columnIndex) + throws SQLException { + BigDecimal data = cs.getBigDecimal(columnIndex); + return data == null ? BigDecimal.ZERO : data; + } +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/EtChannelService.java b/electripper-system/src/main/java/com/ruoyi/system/service/EtChannelService.java new file mode 100644 index 0000000..a2a9172 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/service/EtChannelService.java @@ -0,0 +1,82 @@ +package com.ruoyi.system.service; + +import com.ruoyi.system.domain.Channel; +import com.ruoyi.system.domain.ChannelQuery; +import com.ruoyi.system.domain.ChannelVO; + +import java.util.List; +import java.util.Map; +import java.util.function.Function; + +/** + * 充值渠道Service接口 + * + * @author ruoyi + * @date 2024-04-15 + */ +public interface EtChannelService +{ + /** + * 查询充值渠道 + * + * @param channelId 充值渠道主键 + * @return 充值渠道 + */ + public ChannelVO selectSmChannelByChannelId(Long channelId); + + /** + * 查询充值渠道列表 + * + * @param smChannel 充值渠道 + * @return 充值渠道集合 + */ + public List selectSmChannelList(ChannelQuery smChannel); + + /** + * 新增充值渠道 + * + * @param channel 充值渠道 + * @return 结果 + */ + public int insertSmChannel(Channel channel); + + /** + * 修改充值渠道 + * + * @param channel 充值渠道 + * @return 结果 + */ + public int updateSmChannel(Channel channel); + + /** + * 批量删除充值渠道 + * + * @param channelIds 需要删除的充值渠道主键集合 + * @return 结果 + */ + public int deleteSmChannelByChannelIds(Long[] channelIds); + + /** + * 删除充值渠道信息 + * + * @param channelId 充值渠道主键 + * @return 结果 + */ + public int deleteSmChannelByChannelId(Long channelId); + + /** + * 查询启用的充值渠道列表 + * + * @return + */ + List selectEnabledRechargeList(); + + /** + * 查询充值渠道映射表 + * + * @param query 查询条件 + * @param keyMapper 映射函数 + */ + Map selectMap(ChannelQuery query, Function keyMapper); + +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/EtChannelWithdrawService.java b/electripper-system/src/main/java/com/ruoyi/system/service/EtChannelWithdrawService.java new file mode 100644 index 0000000..82fb45d --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/service/EtChannelWithdrawService.java @@ -0,0 +1,69 @@ +package com.ruoyi.system.service; + +import com.ruoyi.system.domain.ChannelWithdraw; +import com.ruoyi.system.domain.ChannelWithdrawQuery; +import com.ruoyi.system.domain.ChannelWithdrawVO; + +import java.util.List; + +/** + * 提现渠道Service接口 + * + * @author ruoyi + * @date 2024-08-02 + */ +public interface EtChannelWithdrawService +{ + /** + * 查询提现渠道 + * + * @param channelId 提现渠道主键 + * @return 提现渠道 + */ + public ChannelWithdrawVO selectChannelWithdrawByChannelId(Long channelId); + + /** + * 查询提现渠道列表 + * + * @param channelWithdraw 提现渠道 + * @return 提现渠道集合 + */ + public List selectChannelWithdrawList(ChannelWithdrawQuery channelWithdraw); + + /** + * 新增提现渠道 + * + * @param channelWithdraw 提现渠道 + * @return 结果 + */ + public int insertChannelWithdraw(ChannelWithdraw channelWithdraw); + + /** + * 修改提现渠道 + * + * @param channelWithdraw 提现渠道 + * @return 结果 + */ + public int updateChannelWithdraw(ChannelWithdraw channelWithdraw); + + /** + * 批量删除提现渠道 + * + * @param channelIds 需要删除的提现渠道主键集合 + * @return 结果 + */ + public int deleteChannelWithdrawByChannelIds(Long[] channelIds); + + /** + * 删除提现渠道信息 + * + * @param channelId 提现渠道主键 + * @return 结果 + */ + public int deleteChannelWithdrawByChannelId(Long channelId); + + /** + * 查询用户可用的提现渠道 + */ + List selectEnabledList(Long userId); +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java b/electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java index c4c8d76..e6ac6f6 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java @@ -196,6 +196,11 @@ public interface IAsDeviceService extends IService */ public ResponseVo sendCommandWithResp(String mac, String token, String command, String type,String orderNo); + /** + * 发送命令(带响应) + */ + public ResponseVo sendCommandWithResp(String mac, String token, String command, String type,String orderNo,String lon,String lat); + /** * 查询数据点 */ @@ -371,6 +376,11 @@ public interface IAsDeviceService extends IService */ int bandSn(AsDevice asDevice); + /** + * 根据mac修改sn + */ + int updateSn(AsDevice asDevice); + /** * 根据mac号判断是否有绑定过 */ diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java index a90359a..c2a2740 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java @@ -1241,6 +1241,35 @@ public class AsDeviceServiceImpl extends ServiceImpl i }, 0, TimeUnit.SECONDS); } + /* 异步保存发送命令日志*/ + private void asynchronousSaveLogWithLocation(String url,String command,String mac,String result,String type,String orderNo,String userName,String lon,String lat) { + //异步保存发送命令日志 + scheduledExecutorService.schedule(() -> { + EtCommandLog etCommandLog = new EtCommandLog(); + etCommandLog.setUrl(url); + etCommandLog.setCommand(command); + etCommandLog.setType(type); + etCommandLog.setMac(mac); + AsDevice device = asDeviceMapper.selectAsDeviceByMac(mac); + etCommandLog.setSn(device.getSn()); + etCommandLog.setResult(result); + etCommandLog.setLongitude(device.getLongitude()); + etCommandLog.setLatitude(device.getLatitude()); + etCommandLog.setLon(lon); + etCommandLog.setLat(lat); + etCommandLog.setCreateTime(DateUtils.getNowDate()); + JSONObject paramsObj = JSON.parseObject(result); + String code = paramsObj.getString("code"); + etCommandLog.setCallStatus(code); + etCommandLog.setOrderNo(orderNo); + etCommandLog.setCreateBy(userName); + int i = etCommandLogMapper.insertEtCommandLog(etCommandLog); + if(i>0){ + log.info("【发送命令】异步保存发送命令日志"); + } + }, 0, TimeUnit.SECONDS); + } + @Override /** 发送命令*/ public ResponseVo sendCommandWithResp(String mac, String token,String command,String type,String orderNo) { @@ -1264,6 +1293,29 @@ public class AsDeviceServiceImpl extends ServiceImpl i return JSON.parseObject(result,ResponseVo.class); } + @Override + /** 发送命令*/ + public ResponseVo sendCommandWithResp(String mac, String token,String command,String type,String orderNo,String lon,String lat) { + String param = "device_name=" + mac + "&product_id=" + productId +"&timeout=" + timeout; + String sendUrl = iotUrl+ IotConstants.ADDS_COMMAND + "?"+param; + String result = HttpUtils.sendPostWithToken(sendUrl, command, token); + log.info("【"+type+"】===>IOT请求调用结果:【{}】",result); + ResponseVo responseVo = JSON.parseObject(result, ResponseVo.class); + + if (responseVo.getCode() == 10500) { // 超时 + log.info("第一次请求超时，进行第二次请求..."); + result = HttpUtils.sendPostWithToken(sendUrl, command, token); + log.info("【" + type + "】===>IOT第二次请求调用结果:【{}】", result); + responseVo = JSON.parseObject(result, ResponseVo.class); + } + + if(responseVo.getCode() != 0){ + asynchronousUpdateOnlineStatus(mac); + } + asynchronousSaveLogWithLocation(sendUrl,command,mac,result,type,orderNo,null,lon,lat); + return JSON.parseObject(result,ResponseVo.class); + } + /** 查询数据点*/ @Override public DataPointRes historyDatapoints(String mac, String token) { @@ -1744,7 +1796,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i if(ServiceConstants.RETURN_TYPE_NORMAL.equals(returnType)){ if(!"true".equals(isBluetooth)){ /** 2. 车辆远程关锁*/ - ResponseVo responseVo = sendCommandWithResp(device.getMac(), token, IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "还车关锁",orderNo); + ResponseVo responseVo = sendCommandWithResp(device.getMac(), token, IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "还车关锁",orderNo,lon,lat); if(responseVo.getCode()!=0){ log.info("【还车关锁】远程关锁失败"); throw new ServiceException("远程关锁失败"); @@ -2654,12 +2706,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i public int bandSn(AsDevice asDevice) { AsDevice device = asDeviceMapper.selectAsDeviceByMac(asDevice.getMac()); if(StringUtils.isNotNull(device)){ - device.setSn(asDevice.getSn()); - device.setHardwareVersionId(asDevice.getHardwareVersionId()); - int i = asDeviceMapper.updateAsDeviceBySn(device); - if(i>0){ - log.info("【sn和mac号绑定】===>mac【{}】已经绑定过:更新sn【{}】成功",device.getMac(),device.getSn()); - } + throw new ServiceException("该MAC号已经存在"); }else{ // 调用onenet接口 CreateDeviceVo createDeviceVo = new CreateDeviceVo(); @@ -2687,6 +2734,23 @@ public class AsDeviceServiceImpl extends ServiceImpl i return 1; } + /** + * 根据mac修改sn + */ + @SneakyThrows + @Override + public int updateSn(AsDevice asDevice) { + AsDevice device = new AsDevice(); + device.setSn(asDevice.getSn()); + device.setHardwareVersionId(asDevice.getHardwareVersionId()); + device.setMac(asDevice.getMac()); + int i = asDeviceMapper.updateAsDeviceByMac(device); + if(i>0){ + log.info("【sn和mac号绑定】===>mac【{}】已经绑定过:更新sn【{}】成功",device.getMac(),device.getSn()); + } + return 1; + } + /** * 更新最新的位置信息 diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java index 60153a8..8dbf299 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java @@ -239,6 +239,11 @@ public class CallbackServiceImpl implements CallbackService { asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); // 新增资金流水记录 EtCapitalFlow capitalFlow = capitalFlowRecords(order, ServiceConstants.FLOW_TYPE_INCOME, ServiceConstants.ORDER_TYPE_RIDING, ServiceConstants.OWNER_TYPE_OPERATOR, null, ServiceConstants.PAY_TYPE_WX); + logger.info("=================【骑行支付回调-新增资金流水记录后】=================={}",JSON.toJSON(capitalFlow)); + order.setHandlingCharge(capitalFlow.getHandlingCharge()); + order.setPlatformServiceFee(capitalFlow.getPlatformServiceFee()); + order.setOperatorDividend(capitalFlow.getOperatorDividend()); + order.setCost(getCost(order.getPayFee())); // 发起分账 // BigDecimal dividendAmount= order.getPayFee().subtract(capitalFlow.getHandlingCharge()).subtract(capitalFlow.getPlatformServiceFee());//分账金额（订单实际支付金额-平台服务费-支付手续费） // logger.info("=================【微信支付回调】分账金额=================={}",dividendAmount); @@ -286,7 +291,7 @@ public class CallbackServiceImpl implements CallbackService { throw new ServiceException("【微信支付回调】更新车辆状态失败"); } } - logger.info("=================【微信支付回调】开始更新订单信息=================="); + logger.info("=================【微信支付回调】开始更新订单信息=================={}",JSON.toJSON(order)); int updateEtOrder = orderService.updateEtOrder(order); if(updateEtOrder==0){ logger.error("【微信支付回调】更新订单信息失败"); @@ -305,6 +310,14 @@ public class CallbackServiceImpl implements CallbackService { } } + private BigDecimal getCost(BigDecimal payFee) { + // todo 获取到微信的成本 + BigDecimal bigDecimal = new BigDecimal(0.54).divide(new BigDecimal(100), 6, BigDecimal.ROUND_HALF_UP); + BigDecimal cost = bigDecimal.multiply(payFee).setScale(2, BigDecimal.ROUND_HALF_UP); + logger.info("【保存资金流水记录--订单支付】 成本==============bigDecimal=====================："+bigDecimal); + return cost; + } + private void couponSuccessHandle(EtOrder order) { logger.info("【微信支付回调】优惠券支付-------------1"); /** diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelServiceImpl.java new file mode 100644 index 0000000..7aa9ec2 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelServiceImpl.java @@ -0,0 +1,121 @@ +package com.ruoyi.system.service.impl; + +import com.ruoyi.system.domain.Channel; +import com.ruoyi.system.domain.ChannelQuery; +import com.ruoyi.system.domain.ChannelVO; +import com.ruoyi.system.mapper.EtChannelMapper; +import com.ruoyi.system.service.EtChannelService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 充值渠道Service业务层处理 + * + * @author ruoyi + * @date 2024-04-15 + */ +@Service +public class EtChannelServiceImpl implements EtChannelService +{ + @Resource + private EtChannelMapper etChannelMapper; + + /** + * 查询充值渠道 + * + * @param channelId 充值渠道主键 + * @return 充值渠道 + */ + @Override + public ChannelVO selectSmChannelByChannelId(Long channelId) + { + return etChannelMapper.selectSmChannelByChannelId(channelId); + } + + /** + * 查询充值渠道列表 + * + * @param smChannel 充值渠道 + * @return 充值渠道 + */ + @Override + public List selectSmChannelList(ChannelQuery smChannel) + { + return etChannelMapper.selectSmChannelList(smChannel); + } + + /** + * 新增充值渠道 + * + * @param channel 充值渠道 + * @return 结果 + */ + @Override + public int insertSmChannel(Channel channel) + { + return etChannelMapper.insertSmChannel(channel); + } + + /** + * 修改充值渠道 + * + * @param channel 充值渠道 + * @return 结果 + */ + @Override + public int updateSmChannel(Channel channel) + { + return etChannelMapper.updateSmChannel(channel); + } + + /** + * 批量删除充值渠道 + * + * @param channelIds 需要删除的充值渠道主键 + * @return 结果 + */ + @Override + public int deleteSmChannelByChannelIds(Long[] channelIds) + { + return etChannelMapper.deleteSmChannelByChannelIds(channelIds); + } + + /** + * 删除充值渠道信息 + * + * @param channelId 充值渠道主键 + * @return 结果 + */ + @Override + public int deleteSmChannelByChannelId(Long channelId) + { + return etChannelMapper.deleteSmChannelByChannelId(channelId); + } + + @Override + public List selectEnabledRechargeList() { + ChannelQuery dto = new ChannelQuery(); + dto.setEnabled(true); + return this.selectSmChannelList(dto); + } + + /** + * 查询充值渠道映射表 + * + * @param query 查询条件 + * @param keyMapper 映射函数 + */ + @Override + public Map selectMap(ChannelQuery query, Function keyMapper) { + List list = this.selectSmChannelList(query); +// if (CollectionUtils.isEmptyElement(list)) { +// return Collections.emptyMap(); +// } + return list.stream().collect(Collectors.toMap(keyMapper, item -> item)); + } +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelWithdrawServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelWithdrawServiceImpl.java new file mode 100644 index 0000000..5c32610 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtChannelWithdrawServiceImpl.java @@ -0,0 +1,114 @@ +package com.ruoyi.system.service.impl; + +import com.ruoyi.system.domain.ChannelWithdraw; +import com.ruoyi.system.domain.ChannelWithdrawQuery; +import com.ruoyi.system.domain.ChannelWithdrawVO; +import com.ruoyi.system.mapper.EtChannelWithdrawMapper; +import com.ruoyi.system.service.EtChannelWithdrawService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 提现渠道Service业务层处理 + * + * @author ruoyi + * @date 2024-08-02 + */ +@Service +public class EtChannelWithdrawServiceImpl implements EtChannelWithdrawService +{ + @Resource + private EtChannelWithdrawMapper etChannelWithdrawMapper; + +// @Autowired +// private AccountService accountService; + + /** + * 查询提现渠道 + * + * @param channelId 提现渠道主键 + * @return 提现渠道 + */ + @Override + public ChannelWithdrawVO selectChannelWithdrawByChannelId(Long channelId) + { + return etChannelWithdrawMapper.selectChannelWithdrawByChannelId(channelId); + } + + /** + * 查询提现渠道列表 + * + * @param channelWithdraw 提现渠道 + * @return 提现渠道 + */ + @Override + public List selectChannelWithdrawList(ChannelWithdrawQuery channelWithdraw) + { + return etChannelWithdrawMapper.selectChannelWithdrawList(channelWithdraw); + } + + /** + * 新增提现渠道 + * + * @param channelWithdraw 提现渠道 + * @return 结果 + */ + @Override + public int insertChannelWithdraw(ChannelWithdraw channelWithdraw) + { + return etChannelWithdrawMapper.insertChannelWithdraw(channelWithdraw); + } + + /** + * 修改提现渠道 + * + * @param channelWithdraw 提现渠道 + * @return 结果 + */ + @Override + public int updateChannelWithdraw(ChannelWithdraw channelWithdraw) + { + return etChannelWithdrawMapper.updateChannelWithdraw(channelWithdraw); + } + + /** + * 批量删除提现渠道 + * + * @param channelIds 需要删除的提现渠道主键 + * @return 结果 + */ + @Override + public int deleteChannelWithdrawByChannelIds(Long[] channelIds) + { + return etChannelWithdrawMapper.deleteChannelWithdrawByChannelIds(channelIds); + } + + /** + * 删除提现渠道信息 + * + * @param channelId 提现渠道主键 + * @return 结果 + */ + @Override + public int deleteChannelWithdrawByChannelId(Long channelId) + { + return etChannelWithdrawMapper.deleteChannelWithdrawByChannelId(channelId); + } + + @Override + public List selectEnabledList(Long userId) { + // 查询用户账户列表 +// List accountList = accountService.selectByUserId(userId); +// if (CollectionUtils.isEmptyElement(accountList)) { +// return Collections.emptyList(); +// } + // 查询渠道列表 +// ChannelWithdrawQuery query = new ChannelWithdrawQuery(); +// query.setAccountTypes(CollectionUtils.map(accountList, AccountVO::getAccountType)); +// query.setEnabled(true); +// return this.selectChannelWithdrawList(query); + return null; + } +} diff --git a/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml b/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml index 8240288..4ca4157 100644 --- a/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml @@ -356,9 +356,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where sn = #{sn} - - update + + update et_device + + sn = #{sn}, + hardware_version_id = #{hardwareVersionId}, + + where mac = #{mac} diff --git a/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml b/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml index 17825e4..b634bdb 100644 --- a/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml @@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select - COALESCE(SUM(platform_service_fee), 0) AS net_fee + COALESCE(SUM(f.platform_service_fee), 0) AS net_fee from et_capital_flow f LEFT JOIN et_order o on o.order_no = f.order_no where f.area_id != 14 and f.type = 1 diff --git a/electripper-system/src/main/resources/mapper/system/EtChannelMapper.xml b/electripper-system/src/main/resources/mapper/system/EtChannelMapper.xml new file mode 100644 index 0000000..41d1272 --- /dev/null +++ b/electripper-system/src/main/resources/mapper/system/EtChannelMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + select + sc.channel_id, + sc.name, + sc.enabled, + sc.cost_rate, + sc.picture + from et_channel sc + + + + and sc.name like concat('%', #{query.name}, '%') + and sc.enabled = #{query.enabled} + + and sc.channel_id in + + #{item} + + + + + + + + + + insert into et_channel + + channel_id, + `name`, + enabled, + cost_rate, + picture, + + + #{channelId}, + #{name}, + #{enabled}, + #{costRate}, + #{picture}, + + + + + update et_channel + + name = #{data.name}, + enabled = #{data.enabled}, + cost_rate = #{data.costRate}, + picture = #{data.picture}, + + where channel_id = #{data.channelId} + + + + delete from et_channel where channel_id = #{channelId} + + + + delete from et_channel where channel_id in + + #{channelId} + + + diff --git a/electripper-system/src/main/resources/mapper/system/EtChannelWithdrawMapper.xml b/electripper-system/src/main/resources/mapper/system/EtChannelWithdrawMapper.xml new file mode 100644 index 0000000..cdbad92 --- /dev/null +++ b/electripper-system/src/main/resources/mapper/system/EtChannelWithdrawMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + select + scw.channel_id, + scw.name, + scw.account_type, + scw.service_type, + scw.service_rate, + scw.enabled, + scw.cost_rate, + scw.picture, + scw.min_amount, + scw.max_amount + from et_channel_withdraw scw + + + + and scw.channel_id = #{query.channelId} + and scw.name like concat('%', #{query.name}, '%') + and scw.account_type = #{query.accountType} + and scw.service_type = #{query.serviceType} + and scw.enabled = #{query.enabled} + + and scw.account_type in + + #{item} + + + + + + + + + + insert into et_channel_withdraw + + name, + account_type, + service_type, + service_rate, + enabled, + cost_rate, + picture, + min_amount, + max_amount, + + + #{name}, + #{accountType}, + #{serviceType}, + #{serviceRate}, + #{enabled}, + #{costRate}, + #{picture}, + #{minAmount}, + #{maxAmount}, + + + + + update et_channel_withdraw + + name = #{data.name}, + account_type = #{data.accountType}, + service_type = #{data.serviceType}, + service_rate = #{data.serviceRate}, + enabled = #{data.enabled}, + cost_rate = #{data.costRate}, + picture = #{data.picture}, + min_amount = #{data.minAmount}, + max_amount = #{data.maxAmount}, + + where channel_id = #{data.channelId} + + + + delete from et_channel_withdraw where channel_id = #{channelId} + + + + delete from et_channel_withdraw where channel_id in + + #{channelId} + + + diff --git a/electripper-system/src/main/resources/mapper/system/EtCommandLogMapper.xml b/electripper-system/src/main/resources/mapper/system/EtCommandLogMapper.xml index 5533ae9..cfd8b9f 100644 --- a/electripper-system/src/main/resources/mapper/system/EtCommandLogMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtCommandLogMapper.xml @@ -14,6 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -22,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, url, command, type, mac, sn, result, longitude, latitude, call_status, create_by, create_time, order_no, msg from et_command_log + select id, url, command, type, mac, sn, result, longitude, latitude, lon, lat, call_status, create_by, create_time, order_no, msg from et_command_log @@ -126,7 +129,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" o.audio_files, o.used_sn, o.change_reason, - o.locking + o.locking, + o.handling_charge, + o.platform_service_fee, + o.operator_dividend FROM et_order o LEFT JOIN @@ -221,7 +227,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" o.audio_files, o.used_sn, o.change_reason, - o.locking + o.locking, + o.handling_charge, + o.platform_service_fee, + o.operator_dividend FROM et_order o LEFT JOIN @@ -946,6 +955,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" charging_cycle = #{chargingCycle}, charging_cycle_value = #{chargingCycleValue}, capped_amount = #{cappedAmount}, + handling_charge = #{handlingCharge}, + platform_service_fee = #{platformServiceFee}, + operator_dividend = #{operatorDividend}, where order_id = #{orderId} @@ -1001,6 +1013,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" charging_cycle = #{chargingCycle}, charging_cycle_value = #{chargingCycleValue}, capped_amount = #{cappedAmount}, + handling_charge = #{handlingCharge}, + platform_service_fee = #{platformServiceFee}, + operator_dividend = #{operatorDividend}, where order_no = #{orderNo}