diff --git a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java index 4930f4a..cb79b6e 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -68,7 +68,7 @@ public class CashCollectionController { } //撤回未审核的收款订单 @PostMapping("/cancel") - public Result cancel(@RequestBody CashRecord cashRecord) { + public Result cancel(@RequestBody CashCollection cashRecord) { try { return Result.success( cashCollectionService.cancel(cashRecord.getOrderCode())); @@ -78,7 +78,7 @@ public class CashCollectionController { } //重新提交审核的收款订单 @PostMapping("/reSubmit") - public Result reSubmit(@RequestBody CashRecord cashRecord) { + public Result reSubmit(@RequestBody CashCollection cashRecord) { try { return Result.success(cashCollectionService.reSubmit(cashRecord)); }catch (Exception e){ @@ -113,7 +113,7 @@ public class CashCollectionController { }} //补全手续费等 @PostMapping("/complete") - public Result complete(@RequestBody CashRecord cashRecord) { + public Result complete(@RequestBody CashCollection cashRecord) { try { return Result.success(cashCollectionService.complete(cashRecord)); }catch (Exception e){ diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java index b25d472..38cfc61 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java @@ -61,7 +61,7 @@ public class CashCollection implements Serializable { private String remark; // 备注 private String receivedRemark; //到账备注 private String rejectReason; // 驳回理由 - private String auditId; //审核人id + private Integer auditId; //审核人id private String auditName; //审核人id private Integer cashRoleId; //角色id(0客服，1地区财务/负责人，2总部) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") diff --git a/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java b/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java index e243824..f92f221 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashAuditMapper.java @@ -1,6 +1,7 @@ package com.example.demo.mapper.cash; import com.example.demo.domain.entity.CashRecord; +import com.example.demo.domain.vo.cash.CashCollection; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -15,7 +16,7 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface CashAuditMapper { //审核收款订单 - void updateOrder (CashRecord updateOrder); + void updateOrder (CashCollection updateOrder); //根据id获取审核人姓名 String getAuditName(Integer auditId); } diff --git a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java index 139c995..f55f4f1 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -34,7 +34,7 @@ public interface CashCollectionMapper { @Param("status") Integer status); //编辑订单 // 编辑订单（状态=5）后重新提交 - int updateByOrderCode(@Param("cashRecord") CashRecord cashRecord); + int updateByOrderCode(@Param("cashRecordCollection") CashCollection cashRecord); //多条件查询收款订单列表 List selectCollection1(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize, @@ -43,7 +43,7 @@ public interface CashCollectionMapper { //根据订单号查询待审核的现金收款订单 CashRecord selectAuditByOrderCode(@Param("orderCode") String orderCode); //补全手续费等信息 - int complete(@Param("cashRecord") CashRecord cashRecord); + int complete(@Param("cashRecordCollection") CashCollection cashRecord); //根据精网号获取姓名 String getNameByJwcode(@Param("jwcode") Integer jwcode); //根据精网号获取市场名 diff --git a/src/main/java/com/example/demo/service/cash/CashCollectionService.java b/src/main/java/com/example/demo/service/cash/CashCollectionService.java index 81a1226..45a7628 100644 --- a/src/main/java/com/example/demo/service/cash/CashCollectionService.java +++ b/src/main/java/com/example/demo/service/cash/CashCollectionService.java @@ -24,11 +24,11 @@ public interface CashCollectionService { //撤回未审核的收款订单 String cancel(String orderCode); //编辑并重新提交收款订单 - String reSubmit(CashRecord cashRecord); + String reSubmit(CashCollection cashRecord); //多条件查询收款订单列表 PageInfo selectCollection(Integer pageNum, Integer pageSize, CashCollection cashCollection); //补全手续费等 - String complete(CashRecord cashRecord); + String complete(CashCollection cashRecord); //根据精网号获取姓名和地区 User getNameAndMarket(Integer jwcode); //获取活动列表 diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java index dc44547..b8419b9 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java @@ -4,6 +4,7 @@ import com.example.demo.Util.GoldTistV2; import com.example.demo.domain.entity.CashRecord; import com.example.demo.domain.entity.User; import com.example.demo.domain.entity.UserGoldRecord; +import com.example.demo.domain.vo.cash.CashCollection; import com.example.demo.mapper.cash.CashAuditMapper; import com.example.demo.mapper.cash.CashCollectionMapper; import com.example.demo.mapper.coin.AuditMapper; @@ -46,7 +47,7 @@ public class CashAuditServiceImpl implements CashAuditService { ){ throw new IllegalArgumentException("订单不存在或已被审核"); } - CashRecord updateOrder = new CashRecord(); + CashCollection updateOrder = new CashCollection(); //设置审核人 updateOrder.setAuditId(auditId); //判断是通过还是驳回，更新审核状态 diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index 3f83e6c..c0d86ee 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -133,7 +133,7 @@ public class CashCollectionServiceImpl implements CashCollectionService { //编辑并重新提交收款订单 @Override - public String reSubmit(CashRecord cashRecord) { + public String reSubmit(CashCollection cashRecord) { if (cashRecord.getJwcode()==null){ throw new IllegalArgumentException("精网号不能为空"); } @@ -232,7 +232,7 @@ public class CashCollectionServiceImpl implements CashCollectionService { } //补全手续费等内容 @Override - public String complete(CashRecord cashRecord) { + public String complete(CashCollection cashRecord) { int rows = cashCollectionMapper.complete(cashRecord); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/AdminServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AdminServiceImpl.java index 1014c4e..b28b1a4 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/AdminServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AdminServiceImpl.java @@ -94,7 +94,6 @@ public class AdminServiceImpl implements AdminService { //更新密码 @Override public Result updatePassword(Password password) { - String oldPassword = password.getOldPassword(); String newPassword = password.getNewPassword(); String againPassword = password.getAgainPassword(); @@ -129,15 +128,15 @@ public class AdminServiceImpl implements AdminService { BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); // 使用Spring管理的密码编码器（不要手动new） + + String encodedPassword = passwordEncoder.encode(newPassword); // 更新数据库中的密码 admin.setPassword(encodedPassword); admin.setUpdateTime(new Date()); // 更新修改时间 adminMapper.updatePassword(admin); - return Result.success("密码修改成功"); - } catch (BadCredentialsException e) { // 旧密码验证失败 return Result.error("原密码错误，请重新输入"); @@ -182,6 +181,7 @@ public class AdminServiceImpl implements AdminService { } + //获取当前登录的管理员账号 public String getCurrentAdminAccount() { // 1. 从 Security 上下文获取认证信息 Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); diff --git a/src/main/resources/cashMapper/CashAuditMapper.xml b/src/main/resources/cashMapper/CashAuditMapper.xml index 28e36a4..cba43c8 100644 --- a/src/main/resources/cashMapper/CashAuditMapper.xml +++ b/src/main/resources/cashMapper/CashAuditMapper.xml @@ -4,7 +4,7 @@ - update cash_record + update cash_record_collection set status=#{status}, reject_reason=#{rejectReason}, audit_id=#{auditId}, @@ -13,7 +13,7 @@ \ No newline at end of file diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index ce94b08..beddb7e 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -6,13 +6,13 @@ insert into - cash_record(order_type,jwcode,name,market,activity, + cash_record_collection(order_type,jwcode,name,market,activity, order_code,goods_name,good_num,num_unit,permanent_gold,free_gold, payment_currency,payment_amount,received_market, pay_type,pay_time,status,submitter_id,submitter_market, voucher,remark) values(#{orderType},#{jwcode},#{name},#{market},#{activity}, - #{orderCode},#{goodsName},#{goodNum},#{NumUnit},#{permanentGold},#{freeGold},#{paymentCurrency}, + #{orderCode},#{goodsName},#{goodNum},#{numUnit},#{permanentGold},#{freeGold},#{paymentCurrency}, #{paymentAmount},#{receivedMarket},#{payType},#{payTime}, #{status},#{submitterId},#{submitterMarket},#{voucher},#{remark}) @@ -29,58 +29,57 @@ - update cash_record + update cash_record_collection set status=#{status} where order_code=#{orderCode} - UPDATE cash_record + UPDATE cash_record_collection - jwcode = #{cashRecord.jwcode}, - name = #{cashRecord.name}, - market = #{cashRecord.market}, - activity = #{cashRecord.activity}, - goods_name = #{cashRecord.goodsName}, - good_num = #{cashRecord.goodNum}, - num_unit = #{cashRecord.NumUnit}, - permanent_gold = #{cashRecord.permanentGold}, - free_gold = #{cashRecord.freeGold}, - Num_unit = #{cashRecord.NumUnit}, - payment_currency = #{cashRecord.paymentCurrency}, - payment_amount = #{cashRecord.paymentAmount}, - received_market = #{cashRecord.receivedMarket}, - pay_type = #{cashRecord.payType}, - pay_time = #{cashRecord.payTime}, - voucher = #{cashRecord.voucher}, - remark = #{cashRecord.remark}, + jwcode = #{cashRecordCollection.jwcode}, + name = #{cashRecordCollection.name}, + market = #{cashRecordCollection.market}, + activity = #{cashRecordCollection.activity}, + goods_name = #{cashRecordCollection.goodsName}, + good_num = #{cashRecordCollection.goodNum}, + num_unit = #{cashRecordCollection.numUnit}, + permanent_gold = #{cashRecordCollection.permanentGold}, + free_gold = #{cashRecordCollection.freeGold}, + payment_currency = #{cashRecordCollection.paymentCurrency}, + payment_amount = #{cashRecordCollection.paymentAmount}, + received_market = #{cashRecordCollection.receivedMarket}, + pay_type = #{cashRecordCollection.payType}, + pay_time = #{cashRecordCollection.payTime}, + voucher = #{cashRecordCollection.voucher}, + remark = #{cashRecordCollection.remark}, status = 0, - WHERE order_code = #{cashRecord.orderCode} + WHERE order_code = #{cashRecordCollection.orderCode} AND status = 5 - UPDATE cash_record + UPDATE cash_record_collection - - handling_charge = #{cashRecord.handlingCharge}, + + handling_charge = #{cashRecordCollection.handlingCharge}, - - received_currency = #{cashRecord.receivedCurrency}, + + received_currency = #{cashRecordCollection.receivedCurrency}, - - received_amount = #{cashRecord.receivedAmount}, + + received_amount = #{cashRecordCollection.receivedAmount}, - - received_time = #{cashRecord.receivedTime}, + + received_time = #{cashRecordCollection.receivedTime}, - - payment_currency = #{cashRecord.paymentCurrency}, + + payment_currency = #{cashRecordCollection.paymentCurrency}, - - payment_amount = #{cashRecord.paymentAmount}, + + payment_amount = #{cashRecordCollection.paymentAmount}, status = CASE @@ -95,7 +94,7 @@ ELSE status END - WHERE order_code = #{cashRecord.orderCode} + WHERE order_code = #{cashRecordCollection.orderCode} AND status IN (1, 3) @@ -111,7 +110,7 @@ @@ -131,7 +130,7 @@ cr.audit_id,cr.create_time,cr.update_time,cr.audit_time, a1.admin_name as submitterName, a2.admin_name as auditName - from cash_record cr + from cash_record_collection cr left join admin a1 on cr.submitter_id = a1.id left join admin a2 on cr.audit_id = a2.id left join market m1 on m1.id = cr.market @@ -213,12 +212,12 @@ @@ -249,7 +248,7 @@ cr.pay_type,cr.received_market,cr.pay_time,cr.received_time,cr.audit_id,cr.status,cr.submitter_id, cr.submitter_market,cr.voucher,cr.remark,cr.audit_time,a1.admin_name as submitterName, a2.admin_name as auditName,ra.activity_name as activity - from cash_record cr + from cash_record_collection cr left join admin a1 on cr.submitter_id = a1.id left join admin a2 on cr.audit_id = a2.id left join recharge_activity ra on ra.id = cr.activity