diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java index 8a8f1602..5b98acf8 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java @@ -124,7 +124,7 @@ public class SysFileController String[] idList = ids.split(","); for (String id : idList) { XhpcImg xhpcImg = iXhpcImgService.info(Long.parseLong(id)); - if (null != xhpcImg) { + if (StringUtils.isNotNull(xhpcImg)) { OSSClient ossClient = new OSSClient(environment.getProperty("oss.endpoint"), environment.getProperty("oss.access-key"), environment.getProperty("oss.secret-key")); ossClient.deleteObject(environment.getProperty("oss.bucket-name"), xhpcImg.getUrl()); ossClient.shutdown(); diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java index d44c9729..7e4a1496 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java @@ -41,7 +41,7 @@ public class XhpcHistoryOrderReconciliationStatusController extends BaseControll * @return */ @GetMapping("/internetUser") - @ApiOperation(value = "修改对账状态") + @ApiOperation(value = "流量用户信息") public AjaxResult internetUser(@RequestParam Long userId) { return iXhpcHistoryOrderReconciliationStatusService.internetUser(userId); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java index ffd4766a..cd6e6ac4 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java @@ -89,7 +89,7 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis @Override public AjaxResult internetUser(Long userId) { Map map = redisService.getCacheMap(userId + ":privilege"); - if (null != map) { + if (StringUtils.isNotNull(map)) { String privilege = StringUtils.valueOf(map.get("privilege")); if ("1".equals(privilege)) { String operatorId = StringUtils.valueOf(map.get("operatorId")); @@ -116,7 +116,7 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis @Override public List> page(Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status) { Map map = redisService.getCacheMap(userId + ":privilege"); - if (null != map) { + if (StringUtils.isNotNull(map)) { String privilege = StringUtils.valueOf(map.get("privilege")); if ("1".equals(privilege)) { String operatorId = StringUtils.valueOf(map.get("operatorId")); diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java index 2ab3afc6..7a8a8292 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java @@ -89,7 +89,7 @@ public class XhpcHistoryOrderSortingStatusServiceImpl implements IXhpcHistoryOrd @Override public AjaxResult operatorUser(Long userId) { Map map = redisService.getCacheMap(userId + ":privilege"); - if (null != map) { + if (StringUtils.isNotNull(map)) { String privilege = StringUtils.valueOf(map.get("privilege")); if ("1".equals(privilege)) { String operatorId = StringUtils.valueOf(map.get("operatorId")); @@ -117,7 +117,7 @@ public class XhpcHistoryOrderSortingStatusServiceImpl implements IXhpcHistoryOrd @Override public List> page(Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status) { Map map = redisService.getCacheMap(userId + ":privilege"); - if (null != map) { + if (StringUtils.isNotNull(map)) { String privilege = StringUtils.valueOf(map.get("privilege")); if ("1".equals(privilege)) { String operatorId = StringUtils.valueOf(map.get("operatorId")); diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml index 1a39cdf1..d1f380f7 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml @@ -114,20 +114,20 @@ GROUP BY xho.user_id) b on a.user_id = su.user_id LEFT JOIN xhpc_internet_user xiu on xiu.internet_user_id = su.internet_user_id - where a.user_id = #{userId} + where a.user_id = #{userId} limit 1 \ No newline at end of file diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml index 56d53a41..3341ab64 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml @@ -92,9 +92,8 @@ select xo.operator_id operatorId,xo.`name`,xo.open_bank openbank,xo.card_number cardNumber,a.waitSorting,b.sortingOnTheWay,c.withdrawnCash from sys_user su - LEFT JOIN (select sum(xho.act_power_price+xho.act_service_price) waitSorting,xho.user_id + LEFT JOIN (select sum(xho.act_power_price+xho.act_service_price) waitSorting,xo.operator_id from xhpc_history_order xho - LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charging_order_id LEFT JOIN xhpc_charging_station xcs on xcs.charging_station_id = xho.charging_station_id LEFT JOIN xhpc_operator xo on xo.operator_id = xcs.operator_id @@ -107,11 +106,10 @@ and xho.user_id = #{userId} - GROUP BY xho.user_id) a on su.user_id = a.user_id + GROUP BY xo.operator_id) a on su.operator_id = a.operator_id LEFT JOIN - (select sum(xho.act_power_price+xho.act_service_price) sortingOnTheWay ,xho.user_id + (select sum(xho.act_power_price+xho.act_service_price) sortingOnTheWay ,xo.operator_id from xhpc_history_order xho - LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charging_order_id LEFT JOIN xhpc_charging_station xcs on xcs.charging_station_id = xho.charging_station_id LEFT JOIN xhpc_operator xo on xo.operator_id = xcs.operator_id @@ -119,16 +117,15 @@ where xho.del_flag = 0 and xho.sorting_status = 1 - and xo.operator_id = #{operatorId} + and xo.operator_id = #{operatorId } - - and xcs.user_id = #{userId} + + and xho.user_id = #{userId} - GROUP BY xho.user_id) b on su.user_id = b.user_id + GROUP BY xo.operator_id) b on su.operator_id = b.operator_id LEFT JOIN - (select sum(xho.act_power_price+xho.act_service_price) withdrawnCash ,xho.user_id + (select sum(xho.act_power_price+xho.act_service_price) withdrawnCash ,xo.operator_id from xhpc_history_order xho - LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charging_order_id LEFT JOIN xhpc_charging_station xcs on xcs.charging_station_id = xho.charging_station_id LEFT JOIN xhpc_operator xo on xo.operator_id = xcs.operator_id @@ -136,37 +133,36 @@ where xho.del_flag = 0 and xho.sorting_status = 2 - and xo.operator_id = #{operatorId} + and xo.operator_id = #{operatorId } - and xcs.user_id = #{userId} + and xho.user_id = #{userId} - GROUP BY xho.user_id) c on su.user_id = c.user_id + GROUP BY xo.operator_id) c on su.operator_id = c.operator_id LEFT JOIN xhpc_operator xo on xo.operator_id = su.operator_id - where a.user_id = #{userId} + where su.user_id = #{userId} LIMIT 1 - select xro.recharge_order_id rechargeOrderId ,xro.refund_order_number refundOrderNumber, + select xro.recharge_order_id rechargeOrderId ,xro.recharge_order_number rechargeOrderNumber, xro.alipay_number alipayNumber ,xro.prepay_id prepayid,xro.user_id userId,xro.amount, - xro.type ,xro.`status`,xro.create_time createTime,xau.phone,xdb.dict_value statusName + xro.type ,xro.`status`,xro.create_time createTime,xau.phone,sdd.dict_label statusName from xhpc_recharge_order xro LEFT JOIN xhpc_app_user xau on xau.app_user_id = xro.user_id - LEFT JOIN xhpc_dict_biz xdb on xdb.`code` = 'recharge_order_status' and xdb.dict_key = xro.`status` + LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = 'recharge_order_status' and sdd.dict_value = xro.`status` where xro.del_flag = 0 and xro.recharge_order_id = #{rechargeOrderId} + \ No newline at end of file diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundAuditMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundAuditMapper.xml index af029244..af3cc02e 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundAuditMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundAuditMapper.xml @@ -75,11 +75,14 @@ select xro.refund_order_id refundOrderId ,xro.refund_order_number refundOrderNumber, xro.alipay_number alipayNumber ,xro.prepay_id prepayid,xro.user_id userId,xro.amount, - xro.type,xro.examine_status examineStatus,xro.`status`,xro.create_time createTime,xau.phone,xdb.dict_value statusName + xro.type,xro.examine_status examineStatus,xro.`status`,xro.create_time createTime,xau.phone, + sdd.dict_label statusName,sdds.dict_label examineStatusName from xhpc_refund_order xro LEFT JOIN xhpc_app_user xau on xau.app_user_id = xro.user_id - LEFT JOIN xhpc_dict_biz xdb on xdb.`code` = 'refund_order_status' and xdb.dict_key = xro.`status` + LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = 'refund_order_status' and sdd.dict_value = xro.`status` + LEFT JOIN sys_dict_data sdds on sdds.`dict_type` = 'refund_examine_status' and sdds.dict_value = xro.examine_status where xro.del_flag = 0 and xro.refund_order_id = #{refundOrderId} @@ -152,12 +154,12 @@ select xro.refund_order_id refundOrderId ,xro.refund_order_number refundOrderNumber, xro.alipay_number alipayNumber ,xro.prepay_id prepayid,xro.user_id userId,xro.amount, xro.type,xro.examine_status examineStatus,xro.`status`,xro.create_time createTime, - xau.phone,xdb.dict_value statusName,xdbes.dict_value examineStatusName + xau.phone,sdd.dict_label statusName,sdds.dict_label examineStatusName from xhpc_refund_order xro LEFT JOIN xhpc_app_user xau on xau.app_user_id = xro.user_id - LEFT JOIN xhpc_dict_biz xdb on xdb.`code` = 'refund_order_status' and xdb.dict_key = xro.`status` - LEFT JOIN xhpc_dict_biz xdbes on xdbes.`code` = 'refund_examine_status' and xdbes.dict_key = - xro.`examine_status` + LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = 'refund_order_status' and sdd.dict_value = xro.`status` + LEFT JOIN sys_dict_data sdds on sdds.`dict_type` = 'refund_examine_status' and sdds.dict_value = + xro.examine_status where xro.del_flag = 0 and xau.phone like concat(concat('%', #{phone}), '%') diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml index 1fe618ed..82f5d858 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml @@ -8,9 +8,11 @@ + + @@ -30,6 +32,9 @@ amount, + + remaining_sum, + charge_order_id, @@ -39,6 +44,9 @@ refund_order_id, + + type, + status, @@ -68,6 +76,9 @@ #{amount}, + + #{remainingSum}, + #{chargeOrderId}, @@ -77,6 +88,9 @@ #{refundOrderId}, + + #{type}, + #{status}, @@ -101,18 +115,37 @@ - + select xuas.user_account_statement_id userAccountStatementId,xuas.user_id appUserId,xau.phone , + xuas.amount amount,xuas.remaining_sum remainingSum,xuas.create_time createTime, + xuas.type, sdd.dict_label typeName + from xhpc_user_account_statement xuas + LEFT JOIN xhpc_app_user xau on xau.app_user_id = xuas.user_id + LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = 'account_statement_type' and sdd.dict_value = xuas.type + WHERE xuas.del_flag = 0 + + and xau.app_user_id = #{appUserId} - ORDER BY xra.create_time DESC + ORDER BY xuas.create_time DESC + + + + UPDATE xhpc_app_user + + balance = #{balance}, + + WHERE app_user_id = #{appUserId} + \ No newline at end of file diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java index f7ea7598..b86b65a5 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java @@ -135,7 +135,7 @@ public class XhpcAppUserController extends BaseController { @PostMapping("/jscode2session") @ApiOperation(value = "获取微信权限标识", notes = "jsCode") public Object jsCode(String jsCode, String encryptedData, String iv) { - if (null == jsCode) { + if (StringUtils.isEmpty(jsCode)) { return "信息不完整"; } String url = environment.getProperty("WXGETJSCODE") + jsCode + "&grant_type=authorization_code"; diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java index 0d754cf9..f32e3fa0 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java @@ -55,14 +55,14 @@ public class XhpcInternetUserController extends BaseController { sysUser.setCreateBy(SecurityUtils.getUsername()); sysUser.setPassword(SecurityUtils.encryptPassword(xhpcInternetUser.getPhone())); AjaxResult ajaxResult = remoteSystemService.addUser(sysUser); - if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { + if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { return ajaxResult; } SysUser sysUser1 = iXhpcUserService.selectUserByUserName(sysUser.getUserName()); iXhpcInternetUserService.insert(xhpcInternetUser); sysUser1.setInternetUserId(xhpcInternetUser.getInternetUserId()); ajaxResult = remoteSystemService.editUser(sysUser1); - if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { + if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { return ajaxResult; } return AjaxResult.success(); @@ -89,7 +89,7 @@ public class XhpcInternetUserController extends BaseController { sysUser.setCreateBy(SecurityUtils.getUsername()); sysUser.setPassword(SecurityUtils.encryptPassword(xhpcInternetUser.getPhone())); AjaxResult ajaxResult = remoteSystemService.editUser(sysUser); - if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { + if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { return ajaxResult; } return toAjax(iXhpcInternetUserService.update(xhpcInternetUser)); diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java index a4855745..973f10f6 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java @@ -60,7 +60,7 @@ public class XhpcOperatorController extends BaseController { roleIds[0] = 3l; sysUser.setRoleIds(roleIds); AjaxResult ajaxResult = remoteSystemService.addUser(sysUser); - if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { + if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { return ajaxResult; } if (UserConstants.NOT_UNIQUE.equals(iXhpcOperatorService.checkAccountUnique(xhpcOperator))) { @@ -70,7 +70,7 @@ public class XhpcOperatorController extends BaseController { SysUser sysUser1 = iXhpcUserService.selectUserByUserName(sysUser.getUserName()); sysUser1.setOperatorId(xhpcOperator.getOperatorId()); ajaxResult = remoteSystemService.editUser(sysUser1); - if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { + if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { return ajaxResult; } return AjaxResult.success(); @@ -98,7 +98,7 @@ public class XhpcOperatorController extends BaseController { sysUser.setCreateBy(SecurityUtils.getUsername()); sysUser.setPassword(SecurityUtils.encryptPassword(xhpcOperator.getPhone())); AjaxResult ajaxResult = remoteSystemService.editUser(sysUser); - if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { + if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { return ajaxResult; } if (UserConstants.NOT_UNIQUE.equals(iXhpcOperatorService.checkAccountUnique(xhpcOperator))) { diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java index 6bb493c3..750243f5 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java @@ -60,14 +60,14 @@ public class XhpcUserController extends BaseController { sysUser.setUserType("00"); sysUser.setCreateBy(SecurityUtils.getUsername()); AjaxResult ajaxResult = remoteSystemService.addUser(sysUser); - if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { + if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { return ajaxResult; } SysRole role = new SysRole(); role.setRoleName(sysUser.getUserName()); role.setRoleKey(sysUser.getUserName()); ajaxResult = remoteSystemService.addRole(role); - if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { + if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { return ajaxResult; } return AjaxResult.success(); @@ -84,7 +84,7 @@ public class XhpcUserController extends BaseController { return AjaxResult.error("用户id不能为空"); } AjaxResult ajaxResult = remoteSystemService.editUser(sysUser); - if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { + if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { return ajaxResult; } return AjaxResult.success(); @@ -129,14 +129,14 @@ public class XhpcUserController extends BaseController { sysUser.setUserType("03"); sysUser.setCreateBy(SecurityUtils.getUsername()); AjaxResult ajaxResult = remoteSystemService.addUser(sysUser); - if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { + if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { return ajaxResult; } SysRole role = new SysRole(); role.setRoleName(sysUser.getUserName()); role.setRoleKey(sysUser.getUserName()); ajaxResult = remoteSystemService.addRole(role); - if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { + if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { return ajaxResult; } return AjaxResult.success(); @@ -156,7 +156,7 @@ public class XhpcUserController extends BaseController { return AjaxResult.error("所属运营上不能为空"); } AjaxResult ajaxResult = remoteSystemService.editUser(sysUser); - if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { + if (StringUtils.isNotNull(ajaxResult) && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { return ajaxResult; } return AjaxResult.success(); diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcInternetUser.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcInternetUser.java index 1de4ba81..bc8b81dd 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcInternetUser.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcInternetUser.java @@ -5,6 +5,7 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.math.BigDecimal; import java.util.Date; @@ -75,7 +76,7 @@ public class XhpcInternetUser extends BaseEntity { /** * 余额 */ - private Double money; + private BigDecimal balance; /** * 地址code @@ -203,12 +204,12 @@ public class XhpcInternetUser extends BaseEntity { this.cooperationEndTime = cooperationEndTime; } - public Double getMoney() { - return money; + public BigDecimal getBalance() { + return balance; } - public void setMoney(Double money) { - this.money = money; + public void setBalance(BigDecimal balance) { + this.balance = balance; } public Integer getAreaCode() { diff --git a/xhpc-modules/xhpc-user/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-user/src/main/resources/bootstrap.yml index a4c05c68..258d0d58 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-user/src/main/resources/bootstrap.yml @@ -32,6 +32,6 @@ WXGETJSCODE: "https://api.weixin.qq.com/sns/jscode2session?appid=wxd0a48e00319ef #支付宝公钥 ALIPAYPUBLICKEY: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjHDksTgZTpf0wh7oeTVRp0h3SqzTM2smjEJnx9jF1+q3WSXLRB4OzSzq7VsJ/szcyK10ZGO5PxeQ4u9GAG/U+7xhs7ei1cJB/Er55Sg9SbjfkTpwlDv181UJCRJJ/IAcqyqezwTpB8e2trYmHKovUdt0KR9/tVkGa7hsNd5GfxTOUaAFc3zADqRVM+wGimtG0NYfOF2f8tkmBEAiMMLKq5pbAnHU723a1cm/nfVp7gvXfsnO0k2GvRuHzb8mxIhWLiAnwdK9gEu5za/jWxo/xIvf2sdJPYdWj+yfyzA2e1fJkx4uRUzX31CXxZvP2/tfEcnTdI0gxN+OH2eAMiPVswIDAQAB" #支付宝私钥 -ALIPAYPRIVATEKEY: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCw3YH8KMvE7yH6C/rgnbXjml5NMvCcRNl+tbR9QEjl/9AdDIZaYvlQ72oKiOIk7GmDh3sB0YmiFnTcCj7cmKpZd2wLEP0nwwxTGTbBXi1bo/wQUI1a/mNA8rYZfwxfQZ07E28M2kMB+PE29clu+xo8TtjgiX7jofzEyQfES1uZMMDNLA+1cAYc0ZYo0NCJYEFpXm5SJHauC5+biQnOte49EbmzoXuYRap2RBf6suHEflAEgovk9L+hfPelXKG88lQNtg4w6jzNYRcuBa3IZlTJbLPGxH35eCMu0UGpa5EyH/nK+QrycESvEOfJ60urIU5FmOB2ikly2bgLLXZ43oedAgMBAAECggEBAKWt2qYsUTYaDOn/bvQayNh9Mvl+TocUt+lKrdjm72MFUB7mLLVfIc3/eIaF09Ji5DSiJUh+0T9VagL2VgyvtmQ4yq1TLNKilFkDtZdOcY72/pkJ3GDxDGk68/rOWPiirnc4rT6M91hRqySg+iFMeDcmZWNxabwzcmWlK/Fl5liJD03WNEuUNKE5qD9lQwgJEH9x8XxOtfgTk84UPoscOkHTsK7rhgcagbqT6q40DMfqzjoE0BxdTHAtuXbkhWP49UHFMzyilTbk/fQhpxngqnTXsnS8R8gzg/r5xFmss88yVTWCcjonjkBQGuyuyXIgEHhIrAt8WwXHODqlnttglMECgYEA+bE2G6zKoeQ4ZMmCgj9s894BB8dwtY3u4veM/F2g7b1qt6gh6KCRb+yHv0sOUCVLGsc6mbh/pcw2Ply68ZRleysAog7tAnNIw3YQJtYM1+5To9dCElq0oLBCU8szYgvIrwla00uHFkovrspn4HCwVDmJyQC3Dk9zICP44RlXCyMCgYEAtVVQ4c/mTtkym0iy10YY1HskWiOwAjb0/VnTkXsclePfX/ld3EfUwCeRn93ANhm7Fql8emiU9K5nTx1n/erGhT4AyzMLf3/y4KhIJRa+4dhae6J0W3Sd9oZOnXUiC0WsVxEMVn2BIa9HMFaKdyrKGiu2Vmzqn0Y39xpjPzwrrj8CgYB1MpmMCeGedUmG/RJ14iFYocZoCVO8097hx4H0XloP3M1/YLpxvxQkrafVwPv54FdNPWAjEPdRMfXv9YSFqbqsQjXs2waiFMx9eigAoo2quKGnkHzhspN/rNulCwaWKaPLjJ+F97hzXOTerQBu11XcYplqsBw76kzGNDw4I7W4cwKBgGkAHxay6PyNXnV2kkB/kY8wQyuC8L9HjXNK2WyrajENQ2JypjwQyAwAnZ2BrXRmT+ReffrvphlNB/tS3s20bgHnllQTmbvZng0ixKvdUOi7/CENP+1ZSMLgoJMiqXT3gkTkVU2b3PNhaIqAAivg9ihTWYEQDofuBCgs+n06XVzHAoGAcJKdJR2PPMIkfS7zHec02pZGLiC1mvxQx4rjKKT+OvIyD98KipWCDXieYKseqN2V6EjZE/Nhekpi2Bybhrm8iSQoiJilwaQ33DoBYCnW/pjfwxVLM7ch3fQGsOxJMFLcEC8KLu2k/nZkTGCrfJzmcB9ODA2pfaVXfTA57KIPxuk=" +ALIPAYPRIVATEKEY: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDk04ssyP9xZT5I5no1Hq9eeZ4Rk+rtRh67I++i4XOqmFD2e4Y8HsaSFlCfMZ2FdWdRbDTUeN7MPM6QoJb0mXhwbr61XKom3gVasDKUR5LGRuc0t5GiFeDVloFXiFTvpj9Y5bZHi4cP/2hf2mdrtTw0kkmupCIF1ECNJO3VwdOBeWQMrOGaIGbo3DvWtl5oRN4E6ercWdBRz3U8WGYlFutUKMPEDuAmvLFFp0cYEkOWBaTNOzT1Do9Wk2PnH5Ba1JrBCCzkQRk0GHlPoCGaOUkV3gX0Cxo3NwytkZdVEZzdBwHeX7M/WeaZPsRl53WcimOlCznMZgVMD/LO9iH5YnuFAgMBAAECggEAML3+/2MxRm5SfiTaE0aeBHnTedsQR8qP8T0OZpuvj78yP87AIT5M/gFS2xYuf6cqguWRu1Cj5M1vEs+iWCf4x7pPVUKP3AefDFpL69nzIdkolsojc2tFoTmWA5c+wG2hQMZttX+7HWVCTmivbvoEAQ7IMzMzLBqyRV6AavAGpaVWzmoYFZMX5qMwqucOu2voQ/S5qkJUaQJmTzwInsMvLl7VZN5eJBrlLaKHaTCdW45b6HYvi+fdabq5TQ5J2sMMdqaO4t73iUJnwlf/qvVrhDSCKPGqE64gk4kq9Qcgi+viQp8x/mzMGeU+9avYKG3lcnUGXfHMTl91KciaHfU7AQKBgQD32U3xneeZhcWm4HQitAwoSW1GvCaaSCqu4wZiVhHYclkHbdtl5xpMbUvwDtEMlHI/gvvEs+XDoFVa8zUPXgBsO00vKNAkSqoeE+7lUaQTG8rTtX9lFiJDkX0v9NHzeyVzZi8ZxkpT6GFV2eDRa/+XGht7KdRoiSpvvvEK0QslfQKBgQDsWhWcz0WcpjjsbtrsSoutX2lR180g/2VpKU4Od4OSMYI03DhpCevembgclFSbRpsIvaqIbCeZEcidkaGcjIJ7N8ZVJF/lEEWzUNKAJ1WRozmptXQIXA2E3IZGQPZai8Hm0C+idy0DrXdPPs7JX9EcDN8m40M7DYAS9REyB+5sqQKBgQDnwOFaOZ3Tdzu/dAgEXzky/p3Y05yBDVQkHhLdJsAfFaVcBgRuP+/eYSDtwt0FF1XRP4hugQ0qpKTLm7kUuoBItBbTLyWZmduCrn7nHTT/zTAWUJNkEZNOfR+DFTiwpIj7ZCRMxJbB6PwDC+1lxcfEIdxqiU2dxgzRWskHpTr3/QKBgB3HJ8vu7WVUJ/3Z5ak5pyl7yOgv2T9cDinWs2ftNN15cV85k73gKyCLm3+2TIaXuba7Nr4jakXF0NHRZFw188aUe1+EyrQwfaee+jZ9PjGwL/aqzuiyuF1R73TwgFleHFr5RdchTsGU3GBWmHUUpmLzWDYtEe5hwA4jZDw6dZapAoGBAKsr9GImz8vsKjfzQJMj8OC18ch+U29nwkhjHPnjtE4Zjf7izUC2x8b1EWa59pqXIPv9Kgb2aP2MX/fQHtUwNaRza9vfbRcG4qaATKWNIsV2BR+yI/SP7Hdt7fNfv1Jbivj42zj0HyTNXA7E4GPiZpKMYaXt56JouyoRbBnMoakO" #支付宝appid ALIPAYAPPID: "2021002156615717" \ No newline at end of file diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml index 27aca059..03ad6b63 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml @@ -14,7 +14,7 @@ - + @@ -61,8 +61,8 @@ cooperation_end_time, - - money, + + balance, area_code, @@ -132,8 +132,8 @@ #{cooperationEndTime}, - - #{money}, + + #{balance}, #{areaCode}, @@ -195,7 +195,7 @@ cooperation_end_time = #{cooperationEndTime}, - money = #{money}, + balance = #{balance}, area_code = #{areaCode}, address = #{address}, detailed_address = #{detailedAddress}, @@ -226,7 +226,7 @@ xiu.internet_user_id internetUserId, xiu.`name`, xiu.phone, xiu.contact_name contactName, xiu.contact_phone contactPhone, xiu.open_bank openBank, xiu.card_number cardNumber, xiu.cooperation_start_time cooperationStartTime, xiu.cooperation_end_time cooperationEndTime, - xiu.money, xiu.area_code areaCode, xiu.address, xiu.detailed_address detailedAddress, + xiu.balance, xiu.area_code areaCode, xiu.address, xiu.detailed_address detailedAddress, xiu.commission_type commissionType, xiu.commission_rate commissionRate, xiu.longitude, xiu.latitude, xiu.`status`, xiu.create_by createBy ,xiu.create_time createTime,