diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java index 959f13a..119e366 100644 --- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java +++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java @@ -323,7 +323,7 @@ public class MysqlServiceImpl implements MysqlService { if (ObjectUtils.isEmpty(user)) { logger.info("用户不存在,jwcode={}", data.jwcode); user = new User(); - List country = Collections.singletonList("未知"); + String country = "未知"; String name = "未知"; try { @@ -349,7 +349,7 @@ public class MysqlServiceImpl implements MysqlService { name = (String) dataMap.get("name"); Object countryObj = dataMap.get("country"); if (countryObj instanceof List) { - country = (List) countryObj; + country = (String) countryObj; } logger.info("获取用户信息成功: name={}, country={}", name, country); } @@ -357,10 +357,10 @@ public class MysqlServiceImpl implements MysqlService { } } catch (Exception e) { logger.warn("获取用户信息失败,jwcode={}", data.jwcode, e); - country = Collections.singletonList("未知"); + country = "未知"; } - String market = String.join(",", marketService.getMarketIds(country)); + String market = marketService.getMarketIdsDao(country); user.setJwcode(data.jwcode); user.setName(name); user.setMarket(market); diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java index a25d3ae..98c585b 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java @@ -107,7 +107,7 @@ public class CashRecordDone { private String areaServise; private String areaFinance; - private String areacharge; + private String areaCharge; private String headFinance; diff --git a/src/main/java/com/example/demo/mapper/coin/MarketMapper.java b/src/main/java/com/example/demo/mapper/coin/MarketMapper.java index a40934f..4629817 100644 --- a/src/main/java/com/example/demo/mapper/coin/MarketMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/MarketMapper.java @@ -11,4 +11,7 @@ public interface MarketMapper { List getMarketIds(List list); //获取单个市场id String getMarketId(String market); + + Market getMarketIdDao(String market); + Market getMarketIdBytype(String market); } \ No newline at end of file diff --git a/src/main/java/com/example/demo/service/coin/MarketService.java b/src/main/java/com/example/demo/service/coin/MarketService.java index 56ed054..db7a9ca 100644 --- a/src/main/java/com/example/demo/service/coin/MarketService.java +++ b/src/main/java/com/example/demo/service/coin/MarketService.java @@ -18,5 +18,5 @@ public interface MarketService { //获取市场id List getMarketIds(List list); //dao获取市场id - List getMarketIdsDao(List list); + String getMarketIdsDao(String market); } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index 08f2d7f..456d5f8 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -162,7 +162,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); cashRecordDone1.setStatus(4); if (cashRecordDone1.getId()!=null||cashRecordDone1.getOrderCode()!= null){ cashRefundMapper.updateStatus(cashRecordDone1); - } + }} if (cashRecordDone.getGoodsName() != null && (cashRecordDone.getGoodsName().equals("金币充值") || cashRecordDone.getGoodsName().contains("金币充值"))) { @@ -196,7 +196,10 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 58, //退款免费+永久金币-充值 (double) (userGoldRecord.getFreeDecember()+userGoldRecord.getFreeJune()+userGoldRecord.getPermanentGold() ) /100, userGoldRecord.getRemark(),(double) userGoldRecord.getPermanentGold() / 100, auditName, "退款金币充值");} - cashRefundMapper.updateAudit(cashRecordDone);} + CashRecordDone cashRecordDone1 = new CashRecordDone(); + cashRecordDone1.setHeadFinance(cashRecordDone.getHeadFinance()); + cashRecordDone1.setId(cashRecordDone.getAuditId()); + cashRefundMapper.updateAudit(cashRecordDone1); int result = cashRefundMapper.review(cashRecordDone); return (result > 0 ? Result.success("提交成功") : Result.error("提交失败")).getCode(); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java index 5a10fd3..94a5a5e 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java @@ -1,7 +1,6 @@ package com.example.demo.serviceImpl.coin; import com.example.demo.domain.entity.Market; -import com.example.demo.domain.vo.coin.MenuVo; import com.example.demo.mapper.coin.MarketMapper; import com.example.demo.service.coin.MarketService; import org.springframework.beans.factory.annotation.Autowired; @@ -48,8 +47,13 @@ public class MarketServiceImpl implements MarketService { } @Override - public List getMarketIdsDao(List list) { - return List.of(); + public String getMarketIdsDao(String market) { + Market Market = marketMapper.getMarketIdDao(market); + if (Market.getType()==3){ + return String.valueOf(Market.getParentId()); + } + return String.valueOf(Market.getId()); } + } \ No newline at end of file diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index 08c004d..de328b1 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -12,6 +12,7 @@ bank_code, goods_name, good_num, + audit_id, payment_currency, payment_amount, received_currency, @@ -42,6 +43,7 @@ #{bankCode}, #{goodsName}, #{goodNum}, + #{auditId}, #{paymentCurrency}, #{paymentAmount}, #{receivedCurrency}, @@ -78,7 +80,7 @@ #{areaServise}, #{areaFinance}, #{areacharge}, - #{head_finance} + #{headFinance} ) @@ -123,20 +125,17 @@ update lhl_audit - - area_servise = #{area_servise}, + + area_servise = #{areaServise}, - - area_finance = #{area_finance}, + + area_finance = #{areaFinance}, - - area_charge = #{area_charge}, + + area_charge = #{areaCharge}, - - head_finance = #{head_finance}, - - - execcutor = #{execcutor}, + + head_finance = #{headFinance}, where id = #{auditId} diff --git a/src/main/resources/mapper/MarketMapper.xml b/src/main/resources/mapper/MarketMapper.xml index eb6e58a..43842f3 100644 --- a/src/main/resources/mapper/MarketMapper.xml +++ b/src/main/resources/mapper/MarketMapper.xml @@ -29,4 +29,10 @@ + + \ No newline at end of file