yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加生活照功能

This commit is contained in:
yangjun 2024-07-01 19:06:37 +08:00
parent 6f4398d058
commit c69e8c1b7b
6 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java
View File

@ -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);
}
}

2
src/main/java/com/sqx/modules/artificer/service/ArtificerService.java
View File

@ -43,4 +43,6 @@ public interface ArtificerService extends IService<Artificer> {
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);
}

11
src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java
View File

@ -532,5 +532,16 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> 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("您未实名认证，不能提交生活照！");
}
}
}

13
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

@ -5877,12 +5877,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> 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());

4
src/main/java/com/sqx/modules/artificer/service/impl/RealNameServiceImpl.java
View File

@ -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<RealNameDao, Certification>
}
}

2
src/main/resources/mapper/app/UserMoneyDetailsDao.xml
View File

@ -10,7 +10,7 @@
</select>
<select id="selectSumRefund" resultType="java.math.BigDecimal">
select ifnull(sum(money), 0) from user_money_details where user_id = #{userId} and bl_role = 2 and bl_flag =1 and state = 2
select ifnull(sum(money), 0) from user_money_details where user_id = #{userId} and type =2 and bl_role = 2 and bl_flag =1 and state = 2
<if test="startTime!=null and startTime!=''">
and date_format(create_time,'%Y-%m-%d') >= date_format(#{startTime},'%Y-%m-%d')
</if>