更新9.27

2024-09-27 11:49:38 +08:00 · 2024-09-27 11:49:38 +08:00 · e425475bde
commit e425475bde
parent 173af4884a
9 changed files with 105 additions and 30 deletions
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetLinesChangeController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetLinesChangeController.java
@ -11,10 +11,12 @@ import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
 import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;

 /**
 * <p>
@ -24,12 +26,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 * @author dianliang
 * @since 2024-09-25
 */
-@Controller
-@RequestMapping("/fleet-lines-change")
+@RestController
+@RequestMapping("/fleetLinesChange")
 public class FleetLinesChangeController extends BaseController {

    @Autowired
    private IFleetLinesChangeService fleetLinesChangeService;
+    @GetMapping("/queryByPageUni")
    public ResponseObject queryByPageUni(@RequestParam(value = "page",defaultValue = "1") Integer page,
                                         @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
                                         @Param("integralDetail") FleetLinesChangeVo fleetLinesChangeVo) {
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetMemberController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetMemberController.java
@ -173,7 +173,7 @@ public class FleetMemberController extends BaseController {
            if (list.size() >= 1) {
                for (int i = 0; i < list.size(); i++) {
                    FleetMemberVo fleetMemberVo = (FleetMemberVo) list.get(i);
-                    FleetMember fleetMember = fleetMemberService.queryByMobile(fleetMemberVo.getMobile());
+                    FleetMember fleetMember = fleetMemberService.queryByMobile(fleetMemberVo);
                    if (ObjectUtil.isNotEmpty(fleetMember)){
                        repeat += 1;
                    }else {
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetLinesChange.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetLinesChange.java
@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@ -43,28 +45,28 @@ public class FleetLinesChange implements Serializable {
    private String adjustType;

    @ApiModelProperty(value = "调整额度")
-    private BigDecimal adjustLimit;
+    private Double adjustLimit;

    @ApiModelProperty(value = "创建人")
    private String createBy;

+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建时间")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "更新人")
    private String updateBy;

+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "更新时间")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "剩余额度")
-    private BigDecimal remainingCreditLimit;
+    private Double remainingCreditLimit;

    @ApiModelProperty(value = "被调整额度的用户id")
    private Integer userId;

-    @ApiModelProperty(value = "订单id")
-    private Integer orderId;


 }
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/FleetLinesChangeMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/FleetLinesChangeMapper.java
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.fleet.entity.FleetLinesChange;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fuint.business.fleet.vo.FleetLinesChangeVo;
+import org.apache.ibatis.annotations.Param;

 /**
 * <p>
@ -16,5 +17,5 @@ import com.fuint.business.fleet.vo.FleetLinesChangeVo;
 */
 public interface FleetLinesChangeMapper extends BaseMapper<FleetLinesChange> {

-    IPage<FleetLinesChangeVo> queryAllByLimit(Page page1, FleetLinesChangeVo fleetLinesChangeVo);
+    IPage<FleetLinesChangeVo> queryAllByLimit(Page page1,@Param("fleetLinesChange") FleetLinesChangeVo fleetLinesChangeVo);
 }
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetLinesChangeMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetLinesChangeMapper.xml
@ -2,4 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuint.business.fleet.mapper.FleetLinesChangeMapper">

+    <select id="queryAllByLimit" resultType="com.fuint.business.fleet.vo.FleetLinesChangeVo">
+        select fc.*, mu.name userName
+        from fleet_lines_change fc
+                 left join mt_user mu on mu.id = fc.user_id
+        <where>
+            <if test="fleetLinesChange.fleetId != null and fleetLinesChange.fleetId != ''">
+                and fc.fleet_id = #{fleetLinesChange.fleetId}
+            </if>
+            <if test="fleetLinesChange.storeId != null and fleetLinesChange.storeId != ''">
+                and fc.store_id = #{fleetLinesChange.storeId}
+            </if>
+            <if test="fleetLinesChange.adjustType != null and fleetLinesChange.adjustType != ''">
+                and fc.adjust_type = #{fleetLinesChange.adjustType}
+            </if>
+            <if test="fleetLinesChange.startTime != null and fleetLinesChange.startTime != ''">
+                and fc.create_time between #{fleetLinesChange.startTime} and #{fleetLinesChange.endTime}
+            </if>
+        </where>
+    </select>
 </mapper>
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/FleetMemberService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/FleetMemberService.java
@ -40,7 +40,7 @@ public interface FleetMemberService {
     * @param mobile
     * @return
     */
-    FleetMember queryByMobile(String mobile);
+    FleetMember queryByMobile(FleetMember fleetMember);

    /**
     * 新增数据
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/IFleetLinesChangeService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/IFleetLinesChangeService.java
@ -17,4 +17,11 @@ import com.fuint.business.fleet.vo.FleetLinesChangeVo;
 public interface IFleetLinesChangeService extends IService<FleetLinesChange> {

    IPage<FleetLinesChangeVo> queryByPageUni(Page page1, FleetLinesChangeVo fleetLinesChangeVo);
+
+    /**
+     * 新增额度记录变化
+     * @param fleetLinesChange
+     * @return
+     */
+    int insertFleetLinesChange(FleetLinesChange fleetLinesChange);
 }
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetLinesChangeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetLinesChangeServiceImpl.java
@ -39,4 +39,15 @@ public class FleetLinesChangeServiceImpl extends ServiceImpl<FleetLinesChangeMap
        }
        return this.baseMapper.queryAllByLimit(page1, fleetLinesChangeVo);
    }
+
+    /**
+     * 新增额度记录变化
+     *
+     * @param fleetLinesChange
+     * @return
+     */
+    @Override
+    public int insertFleetLinesChange(FleetLinesChange fleetLinesChange) {
+        return baseMapper.insert(fleetLinesChange);
+    }
 }
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java
@ -1,5 +1,6 @@
 package com.fuint.business.fleet.service.impl;

+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -8,10 +9,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.business.fleet.entity.FleetInfo;
+import com.fuint.business.fleet.entity.FleetLinesChange;
 import com.fuint.business.fleet.entity.FleetMember;
+import com.fuint.business.fleet.mapper.FleetLinesChangeMapper;
 import com.fuint.business.fleet.mapper.FleetMemberMapper;
 import com.fuint.business.fleet.service.FleetInfoService;
 import com.fuint.business.fleet.service.FleetMemberService;
+import com.fuint.business.fleet.service.IFleetLinesChangeService;
 import com.fuint.business.fleet.vo.FleetInfoUniVo;
 import com.fuint.business.fleet.vo.FleetMemberVo;
 import com.fuint.business.storeInformation.entity.LJStore;
@ -63,12 +67,16 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
    @Resource
    private ILJStoreService iljStoreService;

+    @Autowired
+    private IFleetLinesChangeService fleetLinesChangeService;
+
    @Override
    public IPage<FleetMemberVo> queryPage(Page page, FleetMemberVo fleetMember) {
        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
        fleetMember.setStoreId(nowAccountInfo.getStoreId());
        return baseMapper.queryPage(page, fleetMember);
    }
+
    @Override
    public IPage<FleetMemberVo> queryPageByNameOrMobile(Page page, FleetMemberVo fleetMember) {
        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@ -93,9 +101,11 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
    }

    @Override
-    public FleetMember queryByMobile(String mobile) {
+    public FleetMember queryByMobile(FleetMember fleetMember) {
        QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("mobile",mobile);
+//        queryWrapper.eq("mobile",mobile);
+        queryWrapper.eq("fleet_id", fleetMember.getFleetId());
+        queryWrapper.eq("mobile", fleetMember.getMobile());
        queryWrapper.eq("if_log_off", "0");
        return baseMapper.selectOne(queryWrapper);
    }
@ -156,7 +166,7 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM

    @Override
    public int insertFleetMember(FleetMemberVo fleetMember) {
-        FleetMember fleetMember1 = queryByMobile(fleetMember.getMobile());
+        FleetMember fleetMember1 = queryByMobile(fleetMember);
        if (ObjectUtil.isNotEmpty(fleetMember1)) {
            return 0;
        }
@ -184,11 +194,32 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
     */
    @Override
    public int update(FleetMember fleetMember) {
-        FleetMember fleetMember1 = queryByMobile(fleetMember.getMobile());
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        FleetMember fleetMember1 = queryByMobile(fleetMember);
        if (ObjectUtil.isNotEmpty(fleetMember1) && fleetMember1.getId() != fleetMember.getId()) {
            return 0;
        }
-
+        //添加到车队额度变化表
+        FleetLinesChange fleetLinesChange = new FleetLinesChange();
+        if (ObjectUtil.isNotEmpty(fleetMember)) {
+            fleetLinesChange.setFleetId(fleetMember.getFleetId());
+            fleetLinesChange.setUserId(fleetMember.getUserId());
+            fleetLinesChange.setStoreId(fleetMember.getStoreId());
+            fleetLinesChange.setAdjustType(fleetMember.getAdjustType());
+            fleetLinesChange.setAdjustLimit(fleetMember.getAdjustLimit());
+            //剩余额度
+            if (ObjectUtil.isNotEmpty(fleetMember1.getRemainingCreditLimit())) {
+                if (fleetMember.getAdjustType().equals("0")) {
+                    fleetLinesChange.setRemainingCreditLimit(fleetMember1.getRemainingCreditLimit() + fleetMember.getAdjustLimit());
+                } else {
+                    fleetLinesChange.setRemainingCreditLimit(fleetMember1.getRemainingCreditLimit());
+                }
+//                fleetLinesChange.setRemainingCreditLimit(fleetMember1.getRemainingCreditLimit() - fleetMember.getAdjustLimit());
+            }
+            fleetLinesChange.setCreateBy(nowAccountInfo.getId().toString());
+            fleetLinesChange.setCreateTime(DateUtil.date().toLocalDateTime());
+            fleetLinesChangeService.insertFleetLinesChange(fleetLinesChange);
+        }
        return baseMapper.updateById(fleetMember);
    }

@ -280,6 +311,7 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
            mtInvitationMapper.insert(mtInvitation);
        }
    }
+
    //生成用户编号
    private String editUserNo() {
        Random random = new Random();