新增信用分增减分项目配置

失物招领逻辑优化
新增订单更新逻辑
修改用户信用分字段调整

src/main/java/com/sqx/modules/app/controller/UserController.java

@@ -21,6 +21,7 @@ import com.sqx.modules.common.service.CommonInfoService;
 import com.sqx.modules.creditRecord.service.CreditRecordService;
 import com.sqx.modules.message.entity.MessageInfo;
 import com.sqx.modules.message.service.MessageService;
+import com.sqx.modules.orders.entity.Orders;
 import com.sqx.modules.orders.service.OrdersService;
 import com.sqx.modules.pay.service.CashOutService;
 import com.sqx.modules.pay.service.PayDetailsService;
@@ -270,11 +271,15 @@ public class UserController {
      * @param userId 用户id
      * @param type   1:增加 2减少
      * @param score  操作的分数
+     * @param remark
+     * @param orderNo 订单号
+     * @param isDriver 0-用户，1-司机（给谁扣分）
      * @return
      */
     @ApiOperation("修改用户信用分")
-    @PostMapping("updateUserCredit")
-    public Result updateUserCredit(Long userId, Integer type, Integer score, String remark,String orderNo,Integer isDriver) {
+    @PostMapping("/updateUserCredit")
+    public Result updateUserCredit(Long userId, Integer type, Integer score, String remark,String orderNo,Integer isDriver,Long ordersId,Double star) {
+        score = Math.abs(score);
         int maxScore = Integer.parseInt(commonInfoService.findOne(363).getValue());
         if (score <= 0) {
             return Result.error("请填入大于0的数");
@@ -294,6 +299,14 @@ public class UserController {
             }
             recordService.updateUserCreditRecord(userEntity, 2, score, remark,orderNo,isDriver);
         }
+        Orders orders = new Orders();
+        orders.setOrdersId(ordersId);
+        if (isDriver == 0){
+            orders.setScore(star);
+        }else {
+            orders.setDriverScore(star);
+        }
+        ordersService.update(orders);
         MessageInfo riderMessageInfo = new MessageInfo();
         riderMessageInfo.setContent("管理员" + text + "您" + score + "信用分,当前信用分" + userEntity.getCreditScore());
         riderMessageInfo.setTitle("信用分变动通知");
@@ -348,5 +361,12 @@ public class UserController {
         return Result.success().put("data",result);
     }
 
+    @GetMapping("/getUserById")
+    @ApiOperation("获取用户信息（头像，姓名）")
+    public Result getUserById(Long id){
+        UserEntity userEntity = userService.selectUserById(id);
+        return Result.success().put("data",userEntity);
+    }
+
 
 }

src/main/java/com/sqx/modules/creadit/controller/CreditController.java

@@ -0,0 +1,36 @@
+package com.sqx.modules.creadit.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.sqx.common.utils.Result;
+import com.sqx.modules.creadit.entity.Credit;
+import com.sqx.modules.creadit.service.CreditService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@Api(value = "信用分控制配置", tags = {"信用分控制配置"})
+@RequestMapping("/app/credit")
+public class CreditController {
+
+    @Resource
+    private CreditService creditService;
+
+    /**
+     * 0-用户显示扣司机，1-司机端显示扣用户 2-查询全部
+     * @param isDriver
+     * @return
+     */
+    @GetMapping("/getCreditList")
+    @ApiOperation("获取信用分配置列表")
+    public Result getCreditList(Integer isDriver){
+        List<Credit> list = creditService.list(new QueryWrapper<Credit>().eq(isDriver != 2, "is_driver", isDriver));
+        return Result.success().put("data",list);
+    }
+
+}

src/main/java/com/sqx/modules/creadit/dao/CreditDao.java

@@ -0,0 +1,9 @@
+package com.sqx.modules.creadit.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sqx.modules.creadit.entity.Credit;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CreditDao extends BaseMapper<Credit> {
+}

src/main/java/com/sqx/modules/creadit/entity/Credit.java

@@ -0,0 +1,29 @@
+package com.sqx.modules.creadit.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class Credit implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private String description;
+
+    private Integer score;
+
+    private String icon;
+
+    private Integer isDriver;
+
+    private Date createTime;
+}

src/main/java/com/sqx/modules/creadit/service/CreditService.java

@@ -0,0 +1,7 @@
+package com.sqx.modules.creadit.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sqx.modules.creadit.entity.Credit;
+
+public interface CreditService extends IService<Credit> {
+}

src/main/java/com/sqx/modules/creadit/service/impl/CreditServiceImpl.java

@@ -0,0 +1,15 @@
+package com.sqx.modules.creadit.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sqx.modules.creadit.dao.CreditDao;
+import com.sqx.modules.creadit.entity.Credit;
+import com.sqx.modules.creadit.service.CreditService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class CreditServiceImpl extends ServiceImpl<CreditDao, Credit> implements CreditService {
+    @Resource
+    private CreditDao creditDao;
+}

src/main/java/com/sqx/modules/lostAndFound/controller/LostFoundController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -24,14 +25,15 @@ public class LostFoundController {
     @ApiOperation("新增")
     public Result insert(@RequestAttribute("userId")Long userId, LostFound lostFound){
         lostFound.setUserId(userId);
+        lostFound.setCreateTime(new Date());
         return lostFoundService.insert(lostFound);
     }
 
     @Login
     @GetMapping("/select")
     @ApiOperation("查询")
-    public Result select(@RequestAttribute("userId")Long userId,Integer type){
-        List<LostFound> list = lostFoundService.list(new QueryWrapper<LostFound>().eq("user_id", userId).eq("type", type));
+    public Result select(@RequestAttribute("userId")Long userId,Integer loss,Integer type){
+        List<LostFound> list = lostFoundService.list(new QueryWrapper<LostFound>().eq("user_id", userId).eq("loss",loss).eq(type != 2, "type", type));
         return Result.success().put("data",list);
     }
 

src/main/java/com/sqx/modules/lostAndFound/entity/LostFound.java

@@ -35,7 +35,9 @@ public class LostFound implements Serializable {
 
     private Date createTime;
 
-    private Date foundTime;
+    private String foundTime;
 
     private Integer type;
+
+    private String carNum;
 }

src/main/java/com/sqx/modules/orders/entity/Orders.java

@@ -356,7 +356,9 @@ public class Orders implements Serializable {
     @TableField(exist = false)
     private Integer browCount;
 
+    private Double score;
 
+    private Double driverScore;
 
     public Orders() {}
 }

src/main/java/com/sqx/modules/orders/service/OrdersService.java

@@ -18,6 +18,8 @@ public interface OrdersService extends IService<Orders> {
 
     Result payOrders(Long ordersId);
 
+    void update(Orders orders);
+
     void sendOrdersMessage(Orders orders);
 
     Result selectOrdersDetails(Long ordersId,Long driverUserId,Long driverRouteId);

src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImp.java

@@ -255,6 +255,11 @@ public class OrdersServiceImp extends ServiceImpl<OrdersDao, Orders> implements
         return Result.success();
     }
 
+    @Override
+    public void update(Orders orders){
+        baseMapper.updateById(orders);
+    }
+
     @Override
     public void sendOrdersMessage(Orders orders){
         try {

src/main/java/com/sqx/modules/userRealnameInfo/controller/UserRealnameInfoController.java

@@ -39,15 +39,17 @@ public class UserRealnameInfoController {
             userRealnameInfo.setVerifiedStatus(0);
             return Result.success().put("data",userRealnameInfo);
         }
-        //解密身份证号
-        String decrypt = null;
-        try {
-            decrypt = AESCBCWithRandomIV.decrypt(list.get(0).getIdCardNumber(), key);
-        } catch (Exception e) {
-            e.printStackTrace();
+        if (null != list.get(0).getIdCardNumber() && list.get(0).getIdCardNumber() != ""){
+            //解密身份证号
+            String decrypt = null;
+            try {
+                decrypt = AESCBCWithRandomIV.decrypt(list.get(0).getIdCardNumber(), key);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            //脱敏处理
+            list.get(0).setIdCardNumber(userRealnameInfoService.maskIdKeepFront(decrypt));
         }
-        //脱敏处理
-        list.get(0).setIdCardNumber(userRealnameInfoService.maskIdKeepFront(decrypt));
         return Result.success().put("data",list.get(0));
     }