From 236e72bd19af32bd1cfb434df95291701f4245f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 23 Dec 2024 17:58:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=A0=E9=81=93=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrdersServiceImpl.java | 2 +- .../qds/controller/app/AppQdsController.java | 5 ++++- .../bl/commission/qds/dao/QdsCodeDao.java | 3 +++ .../bl/commission/qds/dao/QdsDataDao.java | 1 + .../qds/service/impl/QdsDataServiceImpl.java | 15 ++++++++++---- .../impl/MaterialArtificerServiceImpl.java | 6 +++++- src/main/resources/application-prod.yml | 6 +++--- src/main/resources/application.yml | 2 +- .../mapper/bl/commission/qds/QdsCodeDao.xml | 20 +++++++++++++++++++ .../mapper/bl/commission/qds/QdsDataDao.xml | 9 +++++++++ 10 files changed, 58 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index ea1adb3..24078ea 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -5622,7 +5622,7 @@ public class OrdersServiceImpl extends ServiceImpl implements } insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId()); }else if(orders.getIsSupplement() == 2){ - Orders oldOrders = baseMapper.selectById(orders.getOrdersId()); + Orders oldOrders = baseMapper.selectById(orders.getOldOrdersId()); int timeDifference = orders.getDuration()-oldOrders.getDuration(); if(timeDifference>0){ ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper().eq("orders_id", orders.getOldOrdersId()).last(" order by artificer_time_id desc limit 1 ")); diff --git a/src/main/java/com/sqx/modules/bl/commission/qds/controller/app/AppQdsController.java b/src/main/java/com/sqx/modules/bl/commission/qds/controller/app/AppQdsController.java index ad0e5dd..49b81a7 100644 --- a/src/main/java/com/sqx/modules/bl/commission/qds/controller/app/AppQdsController.java +++ b/src/main/java/com/sqx/modules/bl/commission/qds/controller/app/AppQdsController.java @@ -4,6 +4,7 @@ import com.sqx.common.utils.Result; import com.sqx.modules.app.annotation.Login; import com.sqx.modules.bl.commission.qds.entity.QdsApply; import com.sqx.modules.bl.commission.qds.service.QdsApplyService; +import com.sqx.modules.bl.commission.qds.service.QdsCodeService; import com.sqx.modules.bl.commission.qds.service.QdsDataService; import com.sqx.modules.bl.commission.qds.service.QdsLmService; import io.swagger.annotations.Api; @@ -31,6 +32,9 @@ public class AppQdsController { @Autowired private QdsDataService dataService; + @Autowired + private QdsCodeService codeService; + @GetMapping("/lmList") @ApiOperation("类目列表") public Result lmList(){ @@ -71,5 +75,4 @@ public class AppQdsController { public Result myQds(@RequestAttribute Long userId){ return dataService.myQds(userId); } - } diff --git a/src/main/java/com/sqx/modules/bl/commission/qds/dao/QdsCodeDao.java b/src/main/java/com/sqx/modules/bl/commission/qds/dao/QdsCodeDao.java index 5fbdca0..7b65b67 100644 --- a/src/main/java/com/sqx/modules/bl/commission/qds/dao/QdsCodeDao.java +++ b/src/main/java/com/sqx/modules/bl/commission/qds/dao/QdsCodeDao.java @@ -7,9 +7,12 @@ import com.sqx.modules.bl.commission.qds.entity.QdsCode; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface QdsCodeDao extends BaseMapper { IPage findPage(Page page, @Param("params") QdsCode qdsCode); + List findList(Long userId); int add(QdsCode qdsCode); int update(QdsCode qdsCode); IPage findUserPage(Page page, @Param("params") QdsCode qdsCode); diff --git a/src/main/java/com/sqx/modules/bl/commission/qds/dao/QdsDataDao.java b/src/main/java/com/sqx/modules/bl/commission/qds/dao/QdsDataDao.java index 4cbf32d..232f45b 100644 --- a/src/main/java/com/sqx/modules/bl/commission/qds/dao/QdsDataDao.java +++ b/src/main/java/com/sqx/modules/bl/commission/qds/dao/QdsDataDao.java @@ -11,4 +11,5 @@ import org.apache.ibatis.annotations.Param; public interface QdsDataDao extends BaseMapper { IPage findPage(Page page, @Param("params") QdsData qdsData); IPage invitationUserPage(Page page, @Param("params") QdsData qdsData); + QdsData findQds(QdsData qdsData); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/commission/qds/service/impl/QdsDataServiceImpl.java b/src/main/java/com/sqx/modules/bl/commission/qds/service/impl/QdsDataServiceImpl.java index 42cbca4..e154621 100644 --- a/src/main/java/com/sqx/modules/bl/commission/qds/service/impl/QdsDataServiceImpl.java +++ b/src/main/java/com/sqx/modules/bl/commission/qds/service/impl/QdsDataServiceImpl.java @@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sqx.modules.app.entity.UserMoneyDetails; import com.sqx.modules.app.service.UserMoneyDetailsService; import com.sqx.modules.artificer.entity.Period; +import com.sqx.modules.bl.commission.jjr.entity.JjrData; +import com.sqx.modules.bl.commission.qds.dao.QdsCodeDao; import com.sqx.modules.bl.commission.qds.dao.QdsDataDao; +import com.sqx.modules.bl.commission.qds.entity.QdsCode; import com.sqx.modules.utils.PeriodUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,6 +29,8 @@ public class QdsDataServiceImpl extends ServiceImpl impleme @Autowired private UserMoneyDetailsService userMoneyDetailsService; + @Autowired + private QdsCodeDao qdsCodeDao; @Override public Result findPage(QdsData qdsData){ @@ -99,10 +104,12 @@ public class QdsDataServiceImpl extends ServiceImpl impleme .mapToDouble(UserMoneyDetails -> UserMoneyDetails.getMoney().doubleValue()) .sum(); result.put("notCredited",notCredited);//未入账 - - - - + List codeList = qdsCodeDao.findList(userId); + result.put("codeList",codeList);//渠道码 + QdsData qdsData = new QdsData(); + qdsData.setUserId(userId); + qdsData = baseMapper.findQds(qdsData); + result.put("name",qdsData.getName());//渠道商名称 return Result.success().put("data",result); } } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java b/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java index db2058b..e0371eb 100644 --- a/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java +++ b/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java @@ -116,7 +116,11 @@ public class MaterialArtificerServiceImpl extends ServiceImpl + + insert into bl_qds_code( name, diff --git a/src/main/resources/mapper/bl/commission/qds/QdsDataDao.xml b/src/main/resources/mapper/bl/commission/qds/QdsDataDao.xml index eaff89b..09261b7 100644 --- a/src/main/resources/mapper/bl/commission/qds/QdsDataDao.xml +++ b/src/main/resources/mapper/bl/commission/qds/QdsDataDao.xml @@ -76,4 +76,13 @@ order by b.user_id desc + + \ No newline at end of file