diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/entity/TbProductOrder.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/entity/TbProductOrder.java index 40082cd..c2d7716 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/entity/TbProductOrder.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/entity/TbProductOrder.java @@ -47,6 +47,14 @@ public class TbProductOrder implements Serializable { @Excel(name = "供应商名称", width = 15) @ApiModelProperty(value = "供应商名称") 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) @ApiModelProperty(value = "客户姓名") diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java index 44dd4e4..3eb88c1 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java @@ -18,6 +18,7 @@ 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.productOrder.service.ITbProductOrderService; import org.jeecg.modules.tbCustoms.entity.TbCustoms; import org.jeecg.modules.tbCustoms.service.ITbCustomsService; import org.jeecg.modules.utils.ValidateTool; @@ -48,6 +49,9 @@ public class ProductController extends JeecgController> 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 queryWrapper = QueryGenerator.initQueryWrapper(new TbProductOrder(), req.getParameterMap()); + queryWrapper.eq("buy_user_id", hanHaiMember.getId()).orderByDesc("create_time"); + Page page = new Page(pageNo, pageSize); + IPage pageList = tbProductOrderService.page(page, queryWrapper); + return Result.OK(pageList); + } + + @ApiOperation(value="确认/取消订单", notes="确认/取消订单") @PostMapping(value = "/updateOrder") public Result updateOrder(@RequestBody UpdateOrderReq updateOrderReq, @RequestHeader("X-Access-Token") String token) { diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java index c2e3d90..ab5fc85 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java @@ -126,6 +126,8 @@ public class ProductServiceImpl extends ServiceImpl TbUserRole one1 = tbUserRoleService.getOne(objectLambdaQueryWrapper); JSONObject jsonObject = new JSONObject(); tbProductOrder.setCompanyName(one1.getCompanyName()); + tbProductOrder.setBankName(one1.getBankNama()); + tbProductOrder.setBankAccount(one1.getBankAccount()); jsonObject.put("bankAccount", one1.getBankAccount()); jsonObject.put("companyName", one1.getCompanyName()); jsonObject.put("bankName", one1.getBankNama());