订单

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

@@ -12,9 +12,11 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.postBean.CustomsReq;
+import org.jeecg.modules.postBean.ProductOrderReq;
 import org.jeecg.modules.product.entity.ProductReq;
 import org.jeecg.modules.product.entity.TbProduct;
 import org.jeecg.modules.product.service.ProductService;
+import org.jeecg.modules.productOrder.entity.TbProductOrder;
 import org.jeecg.modules.tbCustoms.entity.TbCustoms;
 import org.jeecg.modules.tbCustoms.service.ITbCustomsService;
 import org.jeecg.modules.utils.ValidateTool;
@@ -145,4 +147,16 @@ public class ProductController extends JeecgController<TbProduct, ProductService
     }
 
 
+    @ApiOperation(value="下订单", notes="订单")
+    @PostMapping(value = "/addProductOrder")
+    public Result<String> addProductOrder(@RequestBody ProductOrderReq productOrderReq, @RequestHeader("X-Access-Token") String token) {
+        if (ValidateTool.isNull(productOrderReq)){
+            return Result.error("参数不能为空!");
+        }
+
+        Result result = tbProductService.addProductOrder(productOrderReq, token);
+        return result;
+    }
+
+
 }

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

@@ -123,7 +123,7 @@ public class UserLoginController {
         //验证码三分钟过期
         redisUtil.set(CommonConstant.PHONE_CODE + mobile, captcha, 180);
         //todo 刷短信接口限制
-        return Result.ok();
+        return Result.ok(captcha);
     }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/controller/OSSFileController.java

@@ -43,7 +43,7 @@ public class OSSFileController {
 		result.setResult(pageList);
 		return result;
 	}
-
+//http://localhost:8081shiro//sys/common/upload
 	@ResponseBody
 	@PostMapping("/upload")
 	//@RequiresRoles("admin")

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

@@ -1,6 +1,8 @@
 package org.jeecg.modules.product.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.postBean.ProductOrderReq;
 import org.jeecg.modules.product.entity.ProductReq;
 import org.jeecg.modules.product.entity.TbProduct;
 
@@ -13,4 +15,9 @@ import org.jeecg.modules.product.entity.TbProduct;
 public interface ProductService extends IService<TbProduct> {
 
    void addProduct(ProductReq productReq,String token);
+
+   Result addProductOrder(ProductOrderReq productReq, String token);
+
+
+
 }

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

@@ -1,15 +1,23 @@
 package org.jeecg.modules.product.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.postBean.ProductOrderReq;
 import org.jeecg.modules.product.entity.ProductReq;
 import org.jeecg.modules.product.entity.TbProduct;
 import org.jeecg.modules.product.mapper.TbProductMapper;
+import org.jeecg.modules.product.service.ITbProductService;
 import org.jeecg.modules.product.service.ProductService;
+import org.jeecg.modules.productOrder.entity.TbProductOrder;
+import org.jeecg.modules.productOrder.service.ITbProductOrderService;
 import org.jeecg.modules.userRole.entity.TbUserRole;
 import org.jeecg.modules.userRole.service.ITbUserRoleService;
+import org.jeecg.modules.utils.ValidateTool;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -29,11 +37,14 @@ public class ProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct>
     @Resource
     private ShiroRealm shiroRealm;
     @Resource
-    private IHanHaiMemberService hanHaiMemberService;
+    private ITbProductService tbProductService;
     @Resource
     private ITbUserRoleService tbUserRoleService;
     @Resource
     private TbProductMapper tbProductMapper;
+    @Resource
+    private ITbProductOrderService tbProductOrderService;
+
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -53,4 +64,38 @@ public class ProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct>
         product.setProductType(2);
         tbProductMapper.insert(product);
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result addProductOrder(ProductOrderReq productReq, String token) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        QueryWrapper<TbProduct> productQueryWrapper = new QueryWrapper<>();
+        productQueryWrapper.eq("id", productReq.getProductId());
+        TbProduct one = tbProductService.getOne(productQueryWrapper);
+        if (ValidateTool.isNull(one)){
+            return Result.error("订单信息错误");
+        }
+        if (one.getAuditStatus()!=1 || one.getShowStatus()!=0){
+            return Result.error("订单状态异常，请刷新");
+        }
+        QueryWrapper<TbUserRole> objectQueryWrapper = new QueryWrapper<>();
+        objectQueryWrapper.eq("user_id",hanHaiMember.getId()).eq("role",0);
+        TbUserRole one2 = tbUserRoleService.getOne(objectQueryWrapper);
+        TbProductOrder tbProductOrder = new TbProductOrder();
+        BeanUtils.copyProperties(productReq, tbProductOrder);
+        tbProductOrder.setBuyUserId(one.getBuyUserId());
+        tbProductOrder.setProductId(productReq.getProductId());
+        tbProductOrder.setUserName(one2.getCompanyName());
+        tbProductOrder.setPhone(one.getPhone());
+            LambdaQueryWrapper<TbUserRole> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        objectLambdaQueryWrapper.eq(TbUserRole::getUserId,one.getUserId()).
+                eq(TbUserRole::getRole,1).eq(TbUserRole::getAuditStatus,1);
+        TbUserRole one1 = tbUserRoleService.getOne(objectLambdaQueryWrapper);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("bankAccount",one1.getBankAccount());
+        jsonObject.put("companyName",one1.getCompanyName());
+        jsonObject.put("bankNama",one1.getBankNama());
+        tbProductOrderService.save(tbProductOrder);
+        return Result.OK(jsonObject);
+    }
 }