dianliang/dl_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:9a1c267afc95cc2374825f3d6003b77414f1f361
Branches Tags
dianliang:master
..
compare: dianliang:9ca5005c7785161e1f2cd07ed28b6abed8ad5386
Branches Tags
dianliang:master

No commits in common. "9a1c267afc95cc2374825f3d6003b77414f1f361" and "9ca5005c7785161e1f2cd07ed28b6abed8ad5386" have entirely different histories.
9a1c267afc ... 9ca5005c77

4 changed files with 2 additions and 26 deletions
Show Stats Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/api/PayApi.java
View File

@ -130,7 +130,7 @@ public class PayApi {
userRequest.openid=sysUser.getOpenId();
// 将元转换为分
double pointsInYuan = memberPoints.getPoints();
userRequest.transferAmount = BigDecimal.valueOf(pointsInYuan).multiply(BigDecimal.valueOf(10)).setScale(0, RoundingMode.HALF_UP).longValue();
userRequest.transferAmount = BigDecimal.valueOf(pointsInYuan).multiply(BigDecimal.valueOf(100)).setScale(0, RoundingMode.HALF_UP).longValue();
userRequest.notifyUrl = wechatPayConfig.getZhuanNotifyUrl();
userRequest.outBillNo = orderNo;

14
ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberPointsController.java
View File

@ -7,7 +7,6 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.member.domain.MemberPoints;
import com.ruoyi.member.service.IMemberPointsService;
import org.springframework.beans.factory.annotation.Autowired;
@ -48,19 +47,6 @@ public class MemberPointsController extends BaseController {
return success(list);
}
/**
* 查询在途订单
* @author PQZ
* @date 14:36 2025/4/29
* @return com.ruoyi.common.core.domain.AjaxResult
**/
@GetMapping("/getOnWayOrder")
public AjaxResult getOnWayOrder() {
Long userId = SecurityUtils.getUserId();
List<MemberPoints> list = memberPointsService.getOnWayOrder(userId);
return success(list.isEmpty()?null:list.get(0));
}
/**
* 新增博主积分变动记录

9
ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberPointsService.java
View File

@ -61,13 +61,4 @@ public interface IMemberPointsService extends IService<MemberPoints> {
* @type type 回调状态(success:成功，其他为失败)
**/
void payoutCallback(String orderNo,String type);
/**
* 查询当前登录用户在途订单
* @author PQZ
* @date 14:32 2025/4/29
* @param userId 用户id
* @return java.util.List<com.ruoyi.member.domain.MemberPoints>
**/
List<MemberPoints> getOnWayOrder(Long userId);
}

3
ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
View File

@ -183,8 +183,7 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
* @param userId 用户id
* @return java.util.List<com.ruoyi.member.domain.MemberPoints>
**/
@Override
public List<MemberPoints> getOnWayOrder(Long userId){
private List<MemberPoints> getOnWayOrder(Long userId){
LambdaQueryWrapper<MemberPoints> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper
.eq(MemberPoints::getUserId,userId)