Ver código fonte

付款登记添加订单号

lyhzzz 2 anos atrás
pai
commit
0aebb9fac8

+ 17 - 0
src/main/java/com/fdkankan/sale/controller/BaseController.java

@@ -39,6 +39,23 @@ public class BaseController {
 
         return sysUser.getId();
     }
+    protected SysUser getUser(){
+        String token = request.getHeader("token");
+        DecodedJWT jwt = JWT.decode(token);
+        Long userId = jwt.getClaim("userId").asLong();
+        SysUser sysUser = sysUserService.getByManageId(userId);
+        if(sysUser == null){
+            throw new BusinessException(ResultCode.USER_NOT_LOGIN);
+        }
+
+        return sysUser;
+    }
 
+    public static void main(String[] args) {
+        String token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOjEsImRldmljZSI6ImRlZmF1bHQtZGV2aWNlIiwiZWZmIjotMSwicm5TdHIiOiJ5TUJRdkdDQzk2OURZNDJOaGVueEhuYzI4VUp4Q3MxYSIsInVzZXJJZCI6MSwiaXNBZG1pbiI6MSwidXNlck5hbWUiOiJzdXBlci1hZG1pbiIsIm5pY2tOYW1lIjoi6LaF57qn566h55CG5ZGYIn0.hnLrJoVWLwkWIwWdlUoBoWn2-ETepyI9l5AiLx3ji8M";
+        DecodedJWT jwt = JWT.decode(token);
+        Long userId = jwt.getClaim("userId").asLong();
+        System.out.println(userId);
+    }
 
 }

+ 2 - 0
src/main/java/com/fdkankan/sale/controller/PartController.java

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  *  前端控制器

+ 5 - 1
src/main/java/com/fdkankan/sale/controller/RepairSaleController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.sale.common.ResultCode;
 import com.fdkankan.sale.common.ResultData;
 import com.fdkankan.sale.entity.Repair;
+import com.fdkankan.sale.entity.SysUser;
 import com.fdkankan.sale.exception.BusinessException;
 import com.fdkankan.sale.service.IPartService;
 import com.fdkankan.sale.service.IRepairCommentService;
@@ -44,7 +45,10 @@ public class RepairSaleController extends BaseController{
      */
     @PostMapping("/saleOrderList")
     public ResultData saleOrderList(@RequestBody RepairParam param){
-        param.setUserId(getUserId());
+        SysUser user = getUser();
+        if(user != null && user.getRoleId() != 1){
+            param.setUserId(user.getId());
+        }
         return ResultData.ok(repairSaleService.saleOrderList(param));
     }
 

+ 1 - 1
src/main/java/com/fdkankan/sale/entity/SysRole.java

@@ -51,7 +51,7 @@ public class SysRole implements Serializable {
      * 创建者id
      */
     @TableField("create_user_id")
-    private Integer createUserId;
+    private Long createUserId;
 
     /**
      * 是否禁用 0禁用 1启用

+ 2 - 0
src/main/java/com/fdkankan/sale/service/impl/RepairSaleService.java

@@ -224,6 +224,8 @@ public class RepairSaleService {
         repairPay.setSysUserId(userId);
         repairPay.setPayAmount(payAmount);
         repairPay.setPayTime(DateUtil.getDate());
+        repairPay.setOrderType(0);
+        repairPay.setOrderSn("se_s"+DateUtil.getDate(DateUtil.repairIdFmt));
         repairPayService.save(repairPay);
         repairLogService.saveBySysUser(userId,param.getRepairId(),10,"付款登记");