suojin
/
jinchao
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能开发

Browse Source
master
sunjianxi 1 month ago
parent cda9ca3855
commit 95d2ffaabf
5 changed files with 104 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      src/main/java/org/springblade/modules/jinchao/controller/CatalogController.java
  2. 12
      src/main/java/org/springblade/modules/jinchao/controller/WaterBillController.java
  3. 12
      src/main/java/org/springblade/modules/jinchao/pojo/entity/OrderProjectProductEntity.java
  4. 4
      src/main/java/org/springblade/modules/jinchao/pojo/vo/ProductVO.java
  5. 93
      src/main/java/org/springblade/modules/jinchao/service/impl/ProductServiceImpl.java

29
src/main/java/org/springblade/modules/jinchao/controller/CatalogController.java
Unescape View File

@ -25,6 +25,7 @@
*/
package org.springblade.modules.jinchao.controller;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@ -33,6 +34,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import jakarta.validation.Valid;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.mp.support.Condition;
@ -40,6 +42,10 @@ import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.jinchao.constant.BaseCol;
import org.springblade.modules.jinchao.pojo.entity.OrderEntity;
import org.springblade.modules.jinchao.pojo.entity.OrderProjectProductEntity;
import org.springblade.modules.jinchao.service.IOrderProjectProductService;
import org.springblade.modules.jinchao.service.IOrderService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -52,6 +58,7 @@ import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import java.util.Arrays;
import java.util.Map;
import java.util.List;
@ -70,6 +77,8 @@ import jakarta.servlet.http.HttpServletResponse;
public class CatalogController extends BladeController {
private final ICatalogService catalogService;
private final IOrderProjectProductService orderProjectProductService;
private final IOrderService orderService;
/**
* [产品目录] 详情
@ -135,6 +144,26 @@ public class CatalogController extends BladeController {
if(catalog1 != null && Long.compare(catalog1.getId(),catalog.getId()) != 0){
return R.fail("简称已存在！");
}
List<OrderEntity> orderList = orderService.list(Wrappers.<OrderEntity>lambdaQuery().in(BaseEntity::getStatus, Arrays.asList(new Integer[]{1,2,3,4})));
if(CollectionUtils.isNotEmpty(orderList)){
for(OrderEntity order : orderList){
List<OrderProjectProductEntity> list1 = orderProjectProductService.list(Wrappers.<OrderProjectProductEntity>lambdaQuery().eq(OrderProjectProductEntity::getCatalogOneId,catalog.getId()).eq(OrderProjectProductEntity::getOrderId,order.getId()));
if(CollectionUtils.isNotEmpty(list1)){
for(OrderProjectProductEntity orderProjectProduct : list1){
orderProjectProduct.setCatalogOne(catalog.getName());
orderProjectProductService.updateById(orderProjectProduct);
}
}
List<OrderProjectProductEntity> list2 = orderProjectProductService.list(Wrappers.<OrderProjectProductEntity>lambdaQuery().eq(OrderProjectProductEntity::getCatalogTwoId,catalog.getId()).eq(OrderProjectProductEntity::getOrderId,order.getId()));
if(CollectionUtils.isNotEmpty(list2)){
for(OrderProjectProductEntity orderProjectProduct : list2){
orderProjectProduct.setCatalogTwo(catalog.getName());
orderProjectProductService.updateById(orderProjectProduct);
}
}
}
}
return R.status(catalogService.updateById(catalog));
}

12
src/main/java/org/springblade/modules/jinchao/controller/WaterBillController.java
Unescape View File

@ -26,6 +26,8 @@
package org.springblade.modules.jinchao.controller;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -45,9 +47,11 @@ import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.jinchao.excel.WaterBillExcel;
import org.springblade.modules.jinchao.pojo.entity.OrderEntity;
import org.springblade.modules.jinchao.pojo.entity.RemittanceRecordEntity;
import org.springblade.modules.jinchao.pojo.entity.WaterBillEntity;
import org.springblade.modules.jinchao.pojo.vo.WaterBillVO;
import org.springblade.modules.jinchao.service.IOrderService;
import org.springblade.modules.jinchao.service.IRemittanceRecordService;
import org.springblade.modules.jinchao.service.IWaterBillService;
import org.springblade.modules.jinchao.wrapper.WaterBillWrapper;
import org.springblade.modules.system.pojo.entity.User;
@ -76,6 +80,7 @@ public class WaterBillController extends BladeController {
private final IWaterBillService waterBillService;
private final IOrderService orderService;
private final IRemittanceRecordService remittanceRecordService;
/**
* 水单表 详情
@ -152,6 +157,13 @@ public class WaterBillController extends BladeController {
@ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
List<Long> idList = Func.toLongList(ids);
for(Long id : idList){
List<RemittanceRecordEntity> remittanceRecordList = remittanceRecordService.list(Wrappers.<RemittanceRecordEntity>lambdaQuery().eq(RemittanceRecordEntity::getWaterBillId,id));
if(CollectionUtils.isNotEmpty(remittanceRecordList)){
return R.fail("该水单已生成汇款记录，无法删除！");
}
}
return R.status(waterBillService.deleteLogic(Func.toLongList(ids)));
}

12
src/main/java/org/springblade/modules/jinchao/pojo/entity/OrderProjectProductEntity.java
Unescape View File

@ -127,4 +127,16 @@ public class OrderProjectProductEntity extends TenantEntity {
*/
@Schema(description = "倍率")
private Double multiple;
/**
* 产品大类id
*/
@Schema(description = "产品大类id")
private Long catalogOneId;
/**
* 产品小类id
*/
@Schema(description = "产品小类id")
private Long catalogTwoId;
}

4
src/main/java/org/springblade/modules/jinchao/pojo/vo/ProductVO.java
Unescape View File

@ -97,4 +97,8 @@ public class ProductVO extends ProductEntity {
private String startTime;
private String endTime;
private Long catalogOneId;
private Long catalogTwoId;
}

93
src/main/java/org/springblade/modules/jinchao/service/impl/ProductServiceImpl.java
Unescape View File

@ -147,6 +147,8 @@ public class ProductServiceImpl extends BaseServiceImpl<ProductMapper, ProductEn
CatalogEntity catalogOne = catalogService.getById(catalogTwo.getParentId());
vo.setCatalogOne(catalogOne.getName());
vo.setCatalogTwo(catalogTwo.getName());
vo.setCatalogOneId(catalogOne.getId());
vo.setCatalogTwoId(catalogTwo.getId());
listVO.add(vo);
}
});
@ -154,53 +156,52 @@ public class ProductServiceImpl extends BaseServiceImpl<ProductMapper, ProductEn
IPage<ProductVO> pagesVO = Condition.getPage(query);
pagesVO.setRecords(listVO);
pagesVO.setSize(listVO.size());
if(user.getRoleName().equals("administrator")){
// 迭代器去添加元素。
ListIterator<ProductVO> it = pagesVO.getRecords().listIterator();
while (it.hasNext()) {
ProductVO vo1 = it.next();
// 默认
vo1.setBizType(ProductConst.BIZ_TYPE_PRICE_STANDARD);
// TYPE_PRICE_CUSTOM 数据是拼接上的
LambdaQueryWrapper<BizPriceEntity> wrapper = new LambdaQueryWrapper();
wrapper.eq(BizPriceEntity::getProductId,vo1.getId());
if(customerId != null){
wrapper.eq(BizPriceEntity::getCustomerId,customerId);
}
long count = bizPriceService.count(wrapper);
if (count != 0L) {
List<BizPriceEntity> listBP = bizPriceService.listByProductId(vo1.getId(),customerId);
listBP.forEach(bp -> {
ProductVO vo2 = new ProductVO();
BeanUtils.copyProperties(vo1, vo2);
BeanUtils.copyProperties(bp, vo2);
vo2.setId(vo1.getId());
// 特定价
vo2.setBizType(ProductConst.BIZ_TYPE_PRICE_CUSTOM);
vo2.setBizPriceId(bp.getId());
vo2.setStandardPrice(bp.getBizPrice());
//
CustomerEntity customer = customerService.getById(bp.getCustomerId());
if (customer != null) {
String countryValue = dictService.getValue(ContactConst.DICT_CUSTOMER_COUNTRY, customer.getCountry());
String sbRemark =
countryValue +
customer.getCompanyName() +
"专用";
vo2.setBizRemark(sbRemark);
vo2.setCustomerCompanyName(customer.getCompanyName());
}
{
User u = userService.getById(vo2.getSaleUserId());
if (u != null) {
vo2.setSaleUserRealName(u.getRealName());
}
// 迭代器去添加元素。
ListIterator<ProductVO> it = pagesVO.getRecords().listIterator();
while (it.hasNext()) {
ProductVO vo1 = it.next();
// 默认
vo1.setBizType(ProductConst.BIZ_TYPE_PRICE_STANDARD);
// TYPE_PRICE_CUSTOM 数据是拼接上的
LambdaQueryWrapper<BizPriceEntity> wrapper = new LambdaQueryWrapper();
wrapper.eq(BizPriceEntity::getProductId,vo1.getId());
if(customerId != null){
wrapper.eq(BizPriceEntity::getCustomerId,customerId);
}
long count = bizPriceService.count(wrapper);
if (count != 0L) {
it.remove();
List<BizPriceEntity> listBP = bizPriceService.listByProductId(vo1.getId(),customerId);
listBP.forEach(bp -> {
ProductVO vo2 = new ProductVO();
BeanUtils.copyProperties(vo1, vo2);
BeanUtils.copyProperties(bp, vo2);
vo2.setId(vo1.getId());
// 特定价
vo2.setBizType(ProductConst.BIZ_TYPE_PRICE_CUSTOM);
vo2.setBizPriceId(bp.getId());
vo2.setStandardPrice(bp.getBizPrice());
//
CustomerEntity customer = customerService.getById(bp.getCustomerId());
if (customer != null) {
String countryValue = dictService.getValue(ContactConst.DICT_CUSTOMER_COUNTRY, customer.getCountry());
String sbRemark =
countryValue +
customer.getCompanyName() +
"专用";
vo2.setBizRemark(sbRemark);
vo2.setCustomerCompanyName(customer.getCompanyName());
}
{
User u = userService.getById(vo2.getSaleUserId());
if (u != null) {
vo2.setSaleUserRealName(u.getRealName());
}
it.add(vo2);
});
} else {
log.info("not contain.");
}
}
it.add(vo2);
});
} else {
log.info("not contain.");
}
}

Write Preview
Loading…
Cancel
Save