Browse Source

加我的订单接口

master
cgx 9 months ago
parent
commit
9fac6ce21f
3 changed files with 30 additions and 0 deletions
  1. +8
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/entity/TbProductOrder.java
  2. +20
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java
  3. +2
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java

+ 8
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/entity/TbProductOrder.java View File

@ -47,6 +47,14 @@ public class TbProductOrder implements Serializable {
@Excel(name = "供应商名称", width = 15) @Excel(name = "供应商名称", width = 15)
@ApiModelProperty(value = "供应商名称") @ApiModelProperty(value = "供应商名称")
private java.lang.String companyName; private java.lang.String companyName;
/**供应商银行卡账号*/
@Excel(name = "供应商银行卡账号", width = 15)
@ApiModelProperty(value = "供应商银行卡账号")
private java.lang.String bankAccount;
/**供应商开户行*/
@Excel(name = "供应商开户行", width = 15)
@ApiModelProperty(value = "供应商开户行")
private java.lang.String bankName;
/**客户姓名*/ /**客户姓名*/
@Excel(name = "客户姓名", width = 15) @Excel(name = "客户姓名", width = 15)
@ApiModelProperty(value = "客户姓名") @ApiModelProperty(value = "客户姓名")


+ 20
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java View File

@ -18,6 +18,7 @@ import org.jeecg.modules.product.entity.ProductReq;
import org.jeecg.modules.product.entity.TbProduct; import org.jeecg.modules.product.entity.TbProduct;
import org.jeecg.modules.product.service.ProductService; import org.jeecg.modules.product.service.ProductService;
import org.jeecg.modules.productOrder.entity.TbProductOrder; import org.jeecg.modules.productOrder.entity.TbProductOrder;
import org.jeecg.modules.productOrder.service.ITbProductOrderService;
import org.jeecg.modules.tbCustoms.entity.TbCustoms; import org.jeecg.modules.tbCustoms.entity.TbCustoms;
import org.jeecg.modules.tbCustoms.service.ITbCustomsService; import org.jeecg.modules.tbCustoms.service.ITbCustomsService;
import org.jeecg.modules.utils.ValidateTool; import org.jeecg.modules.utils.ValidateTool;
@ -48,6 +49,9 @@ public class ProductController extends JeecgController<TbProduct, ProductService
@Resource @Resource
private ITbCustomsService tbCustomsService; private ITbCustomsService tbCustomsService;
@Resource
private ITbProductOrderService tbProductOrderService;
/** /**
* 分页列表查询 * 分页列表查询
* *
@ -165,6 +169,22 @@ public class ProductController extends JeecgController<TbProduct, ProductService
} }
@ApiOperation(value = "我的订单列表", notes = "我的订单列表")
@GetMapping(value = "/myOrderlist")
public Result<IPage<TbProductOrder>> myOrderlist(
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req, @RequestHeader("X-Access-Token") String token) {
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
QueryWrapper<TbProductOrder> queryWrapper = QueryGenerator.initQueryWrapper(new TbProductOrder(), req.getParameterMap());
queryWrapper.eq("buy_user_id", hanHaiMember.getId()).orderByDesc("create_time");
Page<TbProductOrder> page = new Page<TbProductOrder>(pageNo, pageSize);
IPage<TbProductOrder> pageList = tbProductOrderService.page(page, queryWrapper);
return Result.OK(pageList);
}
@ApiOperation(value="确认/取消订单", notes="确认/取消订单") @ApiOperation(value="确认/取消订单", notes="确认/取消订单")
@PostMapping(value = "/updateOrder") @PostMapping(value = "/updateOrder")
public Result<String> updateOrder(@RequestBody UpdateOrderReq updateOrderReq, @RequestHeader("X-Access-Token") String token) { public Result<String> updateOrder(@RequestBody UpdateOrderReq updateOrderReq, @RequestHeader("X-Access-Token") String token) {


+ 2
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java View File

@ -126,6 +126,8 @@ public class ProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct>
TbUserRole one1 = tbUserRoleService.getOne(objectLambdaQueryWrapper); TbUserRole one1 = tbUserRoleService.getOne(objectLambdaQueryWrapper);
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
tbProductOrder.setCompanyName(one1.getCompanyName()); tbProductOrder.setCompanyName(one1.getCompanyName());
tbProductOrder.setBankName(one1.getBankNama());
tbProductOrder.setBankAccount(one1.getBankAccount());
jsonObject.put("bankAccount", one1.getBankAccount()); jsonObject.put("bankAccount", one1.getBankAccount());
jsonObject.put("companyName", one1.getCompanyName()); jsonObject.put("companyName", one1.getCompanyName());
jsonObject.put("bankName", one1.getBankNama()); jsonObject.put("bankName", one1.getBankNama());


Loading…
Cancel
Save