修改bug

liujie

2025-10-27 7d236143c108935f5648e5d7452095f4536a18b7

修改bug

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java

@@ -252,7 +252,7 @@

            HashMap<String, Object> map1 = new HashMap<>();
            //TODO hzt
            map1.put("recv_no", "SR2024017174604");
            map1.put("recv_no", "SR2024021195105");
            // 手续费
            BigDecimal bigDecimal = allMoney.multiply(new BigDecimal("0.038")).setScale(2, RoundingMode.HALF_UP);
            payMoney = payMoney.subtract(bigDecimal);
@@ -561,7 +561,7 @@
//            }
            HashMap<String, Object> map1 = new HashMap<>();
            // TODO hzt
            map1.put("recv_no", "SR2024017174604");
            map1.put("recv_no", "SR2024021195105");
            map1.put("amt", erpProcurement.getMoney().multiply(BigDecimal.valueOf(100)).intValue() + "");
            objects.add(map1);
            map.put("total_amt",erpProcurement.getMoney().multiply(BigDecimal.valueOf(100)).intValue() + "");

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java

@@ -14,6 +14,7 @@
import com.ruoyi.system.dto.TErpGoodsUpdateStatusDto;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.ExchangeGoodsRecordQuery;
import com.ruoyi.system.query.PointsRecordDetailQuery;
import com.ruoyi.system.query.TSysGoodsExchangeQuery;
import com.ruoyi.system.query.TSysGoodsQuery;
import com.ruoyi.system.service.*;
@@ -369,7 +370,7 @@
     */
    @ApiOperation(value = "积分变更记录--诊所")
    @PostMapping(value = "/pointsRecordDetail")
    public R<PageInfo<TCrmChangePoints>> pointsRecordDetail(@RequestBody BasePage page) {
    public R<PageInfo<TCrmChangePoints>> pointsRecordDetail(@RequestBody PointsRecordDetailQuery query) {
        SysUser user = tokenService.getLoginUser().getUser();
        Integer roleType = user.getRoleType();
        if (roleType == 5) {
@@ -377,8 +378,14 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));

            PageInfo<TCrmChangePoints> page1 = crmChangePointsService.page(new PageInfo<>(page.getPageNum(), page.getPageSize()), new LambdaQueryWrapper<TCrmChangePoints>().eq(TCrmChangePoints::getBranchSalespersonId, crmClinic.getId()).eq(TCrmChangePoints::getUserType, 3).orderByDesc(BaseModel::getCreateTime));
            LambdaQueryWrapper<TCrmChangePoints> eq = new LambdaQueryWrapper<TCrmChangePoints>().eq(TCrmChangePoints::getBranchSalespersonId, crmClinic.getId()).eq(TCrmChangePoints::getUserType, 3);
            if (query.getChangeReason() != null) {
                eq.eq(TCrmChangePoints::getChangeReason, query.getChangeReason());
            }
            if (query.getTime() != null && !query.getTime().isEmpty()) {
                eq.between(TCrmChangePoints::getCreateTime, query.getTime().split(" - ")+ " 00:00:00", query.getTime().split(" - ")+ " 23:59:59");
            }
            PageInfo<TCrmChangePoints> page1 = crmChangePointsService.page(new PageInfo<>(query.getPageNum(), query.getPageSize()), eq.orderByDesc(BaseModel::getCreateTime));

            return R.ok(page1);
        }

 ruoyi-system/src/main/java/com/ruoyi/system/query/PointsRecordDetailQuery.java

New file
@@ -0,0 +1,17 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("积分变更记录 query")
public class PointsRecordDetailQuery extends BasePage {

    @ApiModelProperty("1=诊所采购 2=商城兑换 3=管理员修改")
    private Integer changeReason;

    @ApiModelProperty("时间")
    private String time;
}