修改报价，身份信息，取消订单，不能重复下单

jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java

@@ -143,6 +143,17 @@ public class ProductController extends JeecgController<TbProduct, ProductService
     }
 
 
+    @ApiOperation(value = "修改产品报价", notes = "修改产品报价")
+    @PostMapping(value = "/updateProduct")
+    public Result<String> updateProduct(@RequestBody ProductReq productReq, @RequestHeader("X-Access-Token") String token) {
+        if (ValidateTool.isNull(productReq) || ValidateTool.isNull(productReq.getId())) {
+            return Result.error("参数错误,id为空!");
+        }
+        return tbProductService.updateProduct(productReq, token);
+    }
+
+
+
 
     @ApiOperation(value="规格分页列表查询", notes="规格分页列表查询")
     @GetMapping(value = "/specsList")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/UserLoginController.java

@@ -111,6 +111,23 @@ public class UserLoginController {
         return userService.role(reqUserRole);
     }
 
+
+    @ApiOperation(value = "修改身份信息")
+    @RequestMapping(value = "/updateRoleInfo", method = RequestMethod.POST)
+    public Result<JSONObject> updateRoleInfo(@RequestBody ReqUserRole reqUserRole) {
+        if (ValidateTool.isNull(reqUserRole)) {
+            return Result.error("参数错误");
+        }
+        if (ValidateTool.isNull(reqUserRole.getUserName())) {
+            return Result.error("请填写用户名");
+        }
+        if (ValidateTool.isNull(reqUserRole.getPassword())) {
+            return Result.error("请填写密码");
+        }
+        return userService.updateRoleInfo(reqUserRole);
+    }
+
+
     /**
      * 发送短信接口
      *

jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/UserService.java

@@ -16,6 +16,7 @@ public interface UserService {
 
     Result<JSONObject> role(ReqUserRole reqUserRole);
 
+    Result<JSONObject> updateRoleInfo(ReqUserRole reqUserRole);
 
     Result<JSONObject> newPassword(PwdModel pwdModel);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/impl/UserServiceImpl.java

@@ -197,7 +197,55 @@ public class UserServiceImpl implements UserService {
         BeanUtils.copyProperties(reqUserRole, tbUserRole);
         tbUserRole.setUserId(one.getId());
         tbUserRole.setAuditStatus(0);
-        tbUserRoleService.save(tbUserRole);
+        if (ValidateTool.isNotNull(one1) && one1.getAuditStatus()==2){
+            //审核失败的重新审核
+            tbUserRole.setId(one1.getId());
+            tbUserRoleService.updateById(tbUserRole);
+        }else {
+            tbUserRoleService.save(tbUserRole);
+        }
+        JSONObject obj = new JSONObject();
+        obj.put("role", tbUserRole);
+        result.setResult(obj);
+        result.setCode(CommonConstant.SC_OK_200);
+        return result;
+    }
+
+    @Transactional
+    @Override
+    public Result<JSONObject> updateRoleInfo(ReqUserRole reqUserRole) {
+        Result<JSONObject> result = new Result<JSONObject>();
+
+        //1. 校验用户是否有效
+        LambdaQueryWrapper<HanHaiMember> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(HanHaiMember::getAccount, reqUserRole.getUserName());
+        HanHaiMember one = iHanHaiMemberService.getOne(queryWrapper);
+        if (ValidateTool.isNull(one)) {
+            return result.error500("用户不存在");
+        }
+        //2. 校验用户名或密码是否正确
+        String userpassword = PasswordUtil.encrypt(reqUserRole.getUserName(), reqUserRole.getPassword(), one.getPasswordSalt());
+        String syspassword = one.getPassword();
+        if (!syspassword.equals(userpassword)) {
+            result.error500("用户名或密码错误");
+            return result;
+        }
+        //getAuditStatus 0审核中 1 审核通过 2审核未通过
+        LambdaQueryWrapper<TbUserRole> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        objectLambdaQueryWrapper.eq(TbUserRole::getUserName,reqUserRole.getUserName()).
+                eq(TbUserRole::getRole,reqUserRole.getRole());
+        TbUserRole one1 = tbUserRoleService.getOne(objectLambdaQueryWrapper);
+
+        TbUserRole tbUserRole = new TbUserRole();
+        BeanUtils.copyProperties(reqUserRole, tbUserRole);
+        tbUserRole.setUserId(one.getId());
+        tbUserRole.setAuditStatus(0);
+        if (ValidateTool.isNotNull(one1)){
+            //有信息就修改没信息就新增
+            tbUserRole.setId(one1.getId());
+        }
+        //有信息就修改没信息就新增
+        tbUserRoleService.saveOrUpdate(tbUserRole);
         JSONObject obj = new JSONObject();
         obj.put("role", tbUserRole);
         result.setResult(obj);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/entity/ProductReq.java

@@ -24,6 +24,8 @@ import java.util.Date;
 public class ProductReq implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "报价id，修改报价时传")
+    private String id;
 
 	/**地址id*/
 	@Excel(name = "地址id", width = 15)

jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/ProductService.java

@@ -17,6 +17,9 @@ public interface ProductService extends IService<TbProduct> {
 
    Result addProduct(ProductReq productReq,String token);
 
+   Result updateProduct(ProductReq productReq,String token);
+
+
    Result addProductOrder(ProductOrderReq productReq, String token);
 
    Result updateOrder(UpdateOrderReq updateOrderReq, String token);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java

@@ -31,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @Description: 产品报价表
@@ -80,7 +81,7 @@ public class ProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct>
         product.setUserId(hanHaiMember.getId());
         product.setCompanyName(one1.getCompanyName());
         product.setAuditStatus(0);
-        product.setAddress(byId.getAddress()+byId.getAddressDetail());
+        product.setAddress(byId.getAddress() + byId.getAddressDetail());
         product.setShowStatus(2);
         //默认图片
         product.setProductType(2);
@@ -89,6 +90,43 @@ public class ProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct>
         return Result.OK("添加成功！");
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result updateProduct(ProductReq productReq, String token) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        LambdaQueryWrapper<TbUserRole> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        objectLambdaQueryWrapper.eq(TbUserRole::getUserId, hanHaiMember.getId()).
+                eq(TbUserRole::getRole, 1).eq(TbUserRole::getAuditStatus, 1);
+        TbUserRole one1 = tbUserRoleService.getOne(objectLambdaQueryWrapper);
+        if (ValidateTool.isNull(one1)) {
+            return Result.error("身份审核未通过");
+        }
+        TbAddress byId = addressService.getById(productReq.getAddressId());
+        if (ValidateTool.isNull(byId)) {
+            return Result.error("请选择地址");
+        }
+//        Object productPic = redisUtil.get("productPic");
+        TbSpecs specs = tbSpecsService.getById(productReq.getSpecsId());
+        if (ValidateTool.isNull(specs)) {
+            return Result.error("请选择规格");
+        }
+        TbProduct product1 = tbProductMapper.selectById(productReq.getId());
+        if (ValidateTool.isNull(product1)){
+            return Result.error("参数错误，报价ID不正确");
+        }
+        TbProduct product = new TbProduct();
+        BeanUtils.copyProperties(productReq, product);
+        product.setUserId(hanHaiMember.getId());
+        product.setId(productReq.getId());
+        product.setCompanyName(one1.getCompanyName());
+        product.setAuditStatus(0);
+        product.setAddress(byId.getAddress() + byId.getAddressDetail());
+        product.setShowStatus(2);
+        //默认图片
+        product.setSpecsName(specs.getSpecsName());
+        tbProductService.updateById(product);
+        return Result.OK("修改成功！");    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Result addProductOrder(ProductOrderReq productReq, String token) {
@@ -102,6 +140,12 @@ public class ProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct>
         if (product.getAuditStatus() != 1 || product.getShowStatus() != 0) {
             return Result.error("订单状态异常，请刷新");
         }
+        QueryWrapper<TbProductOrder> orderQueryWrapper = new QueryWrapper<>();
+        orderQueryWrapper.eq("buy_userId", hanHaiMember.getId()).eq("product_id", productReq.getProductId()).eq("audit_status", 0).eq("del_flag", 0);
+        List<TbProductOrder> list = tbProductOrderService.list(orderQueryWrapper);
+        if (list.size() > 0) {
+            return Result.error("有订单未审核通过，不可重复下单");
+        }
         QueryWrapper<TbUserRole> objectQueryWrapper = new QueryWrapper<>();
         objectQueryWrapper.eq("user_id", hanHaiMember.getId()).eq("role", 0);
         TbUserRole one2 = tbUserRoleService.getOne(objectQueryWrapper);
@@ -153,6 +197,9 @@ public class ProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct>
     @Override
     public Result updateOrder(UpdateOrderReq updateOrderReq, String token) {
         TbProductOrder order = tbProductOrderService.getById(updateOrderReq.getOrderId());
+        if (order.getAuditStatus() == 1) {
+            return Result.error("订单已审核通过，不可修改");
+        }
         if (ValidateTool.isNull(order)) {
             return Result.error("订单信息错误");
         }