diff --git a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java index 78f24f0..479034e 100644 --- a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java +++ b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java @@ -681,4 +681,12 @@ public class AppArtificerController { return userMoneyDetailsService.selectArtificerQianbao(artificer.getArtificerId(),startTime,endTime,page, limit); } + + @Login + @ApiOperation("修改技师生活照") + @PostMapping("/updateShz") + public Result updateShz(@RequestAttribute Long userId,@RequestBody Artificer artificer){ + artificer.setUserId(userId); + return artificerService.updateShz(artificer); + } } diff --git a/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java b/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java index 4500390..0834924 100644 --- a/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java +++ b/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java @@ -43,4 +43,6 @@ public interface ArtificerService extends IService { Result getOrderTypeList(Long userId, Integer page, Integer limit, Integer orderType, Integer isSfwc,String startTime,String endTime); Result getJifenList(Long userId, String startTime, String endTime); + + Result updateShz(Artificer artificer); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java index 0a5dbc7..fa324eb 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java @@ -532,5 +532,16 @@ public class ArtificerServiceImpl extends ServiceImpl i return Result.success(map); } + @Override + public Result updateShz(Artificer artificer) { + if(artificer.getArtificerId()!=null){ + artificer.setUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); + baseMapper.updateById(artificer); + return Result.success(); + }else{ + return Result.error("您未实名认证，不能提交生活照！"); + } + } + } \ No newline at end of file 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 52ef0f2..ed4a2c2 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 @@ -5877,12 +5877,13 @@ public class OrdersServiceImpl extends ServiceImpl implements userMoneyArtificerDetails.setProjectBenefits(orderList.stream().map(e -> e.getProjectBenefits()).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP)); //计算车费收益 userMoneyArtificerDetails.setVehicleFareAmount(orderList.stream().map(e -> e.getArtificerTaxiMoney()).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP)); - //计算渠道扣款 - userMoneyArtificerDetails.setChannelDeduction(orderList.stream().map(e -> e.getChannelDeduction()).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP)); - //计算储值扣款 - userMoneyArtificerDetails.setValueStorageDeduction(orderList.stream().map(e -> e.getValueStorageDeduction()).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP)); - //计算当期收益 项目收益加上车费收益减去渠道扣款和储值扣款 - BigDecimal all = new BigDecimal(String.valueOf(userMoneyArtificerDetails.getProjectBenefits().add(userMoneyArtificerDetails.getVehicleFareAmount()).subtract(userMoneyArtificerDetails.getChannelDeduction()).subtract(userMoneyArtificerDetails.getValueStorageDeduction()))).setScale(2, BigDecimal.ROUND_HALF_UP); + //暂时去掉 +// //计算渠道扣款 +// userMoneyArtificerDetails.setChannelDeduction(orderList.stream().map(e -> e.getChannelDeduction()).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP)); +// //计算储值扣款 +// userMoneyArtificerDetails.setValueStorageDeduction(orderList.stream().map(e -> e.getValueStorageDeduction()).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP)); + //计算当期收益 项目收益 + 车费收益 (暂时去掉了 减去渠道扣款和储值扣款) + BigDecimal all = new BigDecimal(String.valueOf(userMoneyArtificerDetails.getProjectBenefits().add(userMoneyArtificerDetails.getVehicleFareAmount()))).setScale(2, BigDecimal.ROUND_HALF_UP); userMoneyArtificerDetails.setTotalRevenue(all); //插入开始结束时间 userMoneyArtificerDetails.setStartFundData(period.getStartFundData()); diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/RealNameServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/RealNameServiceImpl.java index da862d2..d4610e4 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/RealNameServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/RealNameServiceImpl.java @@ -17,13 +17,10 @@ import com.sqx.modules.artificer.dao.RealNameDao; import com.sqx.modules.artificer.entity.Artificer; import com.sqx.modules.artificer.entity.Certification; import com.sqx.modules.artificer.service.ArtificerService; -import com.sqx.modules.artificer.service.OrdersService; import com.sqx.modules.artificer.service.RealNameService; -import com.sqx.modules.common.entity.CommonInfo; import com.sqx.modules.common.service.CommonInfoService; import com.sqx.modules.sys.entity.SysDictEntity; import com.sqx.modules.sys.service.SysDictService; -import com.sqx.modules.utils.VerifyIdCardUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -255,5 +252,4 @@ public class RealNameServiceImpl extends ServiceImpl } - } diff --git a/src/main/resources/mapper/app/UserMoneyDetailsDao.xml b/src/main/resources/mapper/app/UserMoneyDetailsDao.xml index 83e207d..f512eb3 100644 --- a/src/main/resources/mapper/app/UserMoneyDetailsDao.xml +++ b/src/main/resources/mapper/app/UserMoneyDetailsDao.xml @@ -10,7 +10,7 @@