Skip to content

J
jiedao-api-boot-master
Commit 8e2d5c9b authored by Smile's avatar Smile
Browse files
Options

Merge remote-tracking branch 'origin/release' into jd_dev 

# Conflicts:
#	yudao-server/src/main/resources/i18n/messages_zh.properties
parents d9167b1e 79aa2612
Show whitespace changes
Inline Side-by-side
Showing with 127 additions and 37 deletions
yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerController.java
View file @ 8e2d5c9b
......@@ -57,6 +57,7 @@ import cn.iocoder.yudao.module.member.api.user.dto.UserRespDTO;
import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
import cn.iocoder.yudao.module.order.dal.mysql.order.OrderMapper;
import cn.iocoder.yudao.module.product.vo.product.ProductRespVO;
import cn.iocoder.yudao.module.product.vo.product.ProductTypeRespVO;
import cn.iocoder.yudao.module.sale.dal.dataobject.offer.OfferDO;
import cn.iocoder.yudao.module.sale.dal.mysql.offer.OfferMapper;
import cn.iocoder.yudao.module.system.api.file.FileMakeApi;
......@@ -169,9 +170,9 @@ public class CustomerController {
createReqVO.setIsPotential(true);
createReqVO.setCustomerOperateLogRemark("新增潜在客户");
if (CollectionUtil.isNotEmpty(createReqVO.getProducts())){
createReqVO.setProductTypes(createReqVO.getProducts().stream().map(CustomerProductTypeGroupVO::getTypeId).filter(Objects::nonNull).map(String::valueOf).collect(Collectors.joining(",")));
createReqVO.setProductTypes(createReqVO.getProducts().stream().map(CustomerProductTypeGroupVO::getTypeId).filter(Objects::nonNull).distinct().map(String::valueOf).collect(Collectors.joining(",")));
createReqVO.setProductIds(createReqVO.getProducts().stream().map(CustomerProductTypeGroupVO::getProductIds)
.flatMap(Collection::stream).filter(Objects::nonNull).map(String::valueOf).collect(Collectors.joining(",")));
.flatMap(Collection::stream).filter(Objects::nonNull).distinct().map(String::valueOf).collect(Collectors.joining(",")));
}
return createCustomerPrivate(createReqVO);
}
......@@ -185,9 +186,9 @@ public class CustomerController {
HttpServletRequest request) {
createReqVO.setCustomerOperateLogRemark("管理端页面新建客户");
if (CollectionUtil.isNotEmpty(createReqVO.getProducts())){
createReqVO.setProductTypes(createReqVO.getProducts().stream().map(CustomerProductTypeGroupVO::getTypeId).filter(Objects::nonNull).map(String::valueOf).map(String::valueOf).collect(Collectors.joining(",")));
createReqVO.setProductTypes(createReqVO.getProducts().stream().map(CustomerProductTypeGroupVO::getTypeId).filter(Objects::nonNull).distinct().map(String::valueOf).collect(Collectors.joining(",")));
createReqVO.setProductIds(createReqVO.getProducts().stream().map(CustomerProductTypeGroupVO::getProductIds)
.flatMap(Collection::stream).filter(Objects::nonNull).map(String::valueOf).map(String::valueOf).collect(Collectors.joining(",")));
.flatMap(Collection::stream).filter(Objects::nonNull).distinct().map(String::valueOf).collect(Collectors.joining(",")));
}
return createCustomerPrivate(createReqVO);
}
......@@ -261,9 +262,9 @@ public class CustomerController {
List<CustomerContactsUpdateReqVO> customerContacts =
updateReqVO.getCustomerContacts();
if (CollectionUtil.isNotEmpty(updateReqVO.getProducts())){
updateReqVO.setProductTypes(updateReqVO.getProducts().stream().map(CustomerProductTypeGroupVO::getTypeId).filter(Objects::nonNull).map(String::valueOf).collect(Collectors.joining(",")));
updateReqVO.setProductTypes(updateReqVO.getProducts().stream().map(CustomerProductTypeGroupVO::getTypeId).filter(Objects::nonNull).distinct().map(String::valueOf).collect(Collectors.joining(",")));
updateReqVO.setProductIds(updateReqVO.getProducts().stream().map(CustomerProductTypeGroupVO::getProductIds)
.flatMap(Collection::stream).filter(Objects::nonNull).map(String::valueOf).collect(Collectors.joining(",")));
.flatMap(Collection::stream).filter(Objects::nonNull).distinct().map(String::valueOf).collect(Collectors.joining(",")));
}
if (!CollectionUtils.isEmpty(customerContacts)) {
long count = customerContacts.stream().filter(t -> CustomerContactsDefaultEnum.IS_DEFAULT.getValue().equals(t.getIsDefault())).count();
......@@ -354,9 +355,9 @@ public class CustomerController {
//完善信息要确认接收
updateReqVO.setIsCustomerServiceConfirmed(true);
if (CollectionUtil.isNotEmpty(updateReqVO.getProducts())){
updateReqVO.setProductTypes(updateReqVO.getProducts().stream().map(CustomerProductTypeGroupVO::getTypeId).filter(Objects::nonNull).map(String::valueOf).collect(Collectors.joining(",")));
updateReqVO.setProductTypes(updateReqVO.getProducts().stream().map(CustomerProductTypeGroupVO::getTypeId).filter(Objects::nonNull).distinct().map(String::valueOf).collect(Collectors.joining(",")));
updateReqVO.setProductIds(updateReqVO.getProducts().stream().map(CustomerProductTypeGroupVO::getProductIds)
.flatMap(Collection::stream).filter(Objects::nonNull).map(String::valueOf).collect(Collectors.joining(",")));
.flatMap(Collection::stream).filter(Objects::nonNull).distinct().map(String::valueOf).collect(Collectors.joining(",")));
}
//完善客户信息确认接收时要计算客户的业绩类型
return this.updateCustomer(updateReqVO);
......@@ -446,6 +447,17 @@ public class CustomerController {
productTypeGroupVO.setProductIds(entry.getValue().stream().map(ProductRespVO::getId).collect(Collectors.toList()));
return productTypeGroupVO;
}).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(respVO.getProductTypeList())){
// 允许选择了主营类别，但是该主营类别下面没有对应的商品
for (ProductTypeRespVO typeRespVO : respVO.getProductTypeList()) {
if (!productRespVOMap.containsKey(typeRespVO.getId())) {
CustomerProductTypeGroupVO productTypeGroupVO = new CustomerProductTypeGroupVO();
productTypeGroupVO.setTypeId(typeRespVO.getId());
productTypeGroupVO.setProductIds(new ArrayList<>());
products.add(productTypeGroupVO);
}
}
}
respVO.setProducts(products);
}
......@@ -498,6 +510,17 @@ public class CustomerController {
productTypeGroupVO.setProductIds(entry.getValue().stream().map(ProductRespVO::getId).collect(Collectors.toList()));
return productTypeGroupVO;
}).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(respVO.getProductTypeList())){
// 允许选择了主营类别，但是该主营类别下面没有对应的商品
for (ProductTypeRespVO typeRespVO : respVO.getProductTypeList()) {
if (!productRespVOMap.containsKey(typeRespVO.getId())) {
CustomerProductTypeGroupVO productTypeGroupVO = new CustomerProductTypeGroupVO();
productTypeGroupVO.setTypeId(typeRespVO.getId());
productTypeGroupVO.setProductIds(new ArrayList<>());
products.add(productTypeGroupVO);
}
}
}
respVO.setProducts(products);
}
Long founder = respVO.getFounder();
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ 8e2d5c9b
......@@ -1864,8 +1864,17 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
* 订单修改审批流程跟现有的订单审批流程一致，订单信息修改后无需产生异常，不判断异常条件是否满足
* 海运订单、拆单子单已装柜/空运已出货，订单信息修改，不需要更新价格
*/
// 海运订单预装未装柜/空运订单分拣未出货, 锁定订单信息无法修改
if (vo.getShipmentState() == 0 || vo.getShipmentState() == 305 || vo.getShipmentState() == 307 || vo.getShipmentState() == 407) {
// 海运订单预装未装柜/空运订单分拣未出货, 锁定订单信息无法修改 exclude(scope.row.shipmentState, [305, 307, 309, 310, 311, 313, 407,409])
if (vo.getShipmentState() == 0
|| vo.getShipmentState() == 305
|| vo.getShipmentState() == 307
|| vo.getShipmentState() == 309
|| vo.getShipmentState() == 310
|| vo.getShipmentState() == 311
|| vo.getShipmentState() == 313
|| vo.getShipmentState() == 407
|| vo.getShipmentState() == 409
|| vo.getShipmentState() == 411) {
if (vo.getTransportId() == TransportTypeShortEnum.SEA_CONTAINER.getValue()) {
throw exception(ORDER_PRE_INSTALLATION_UNPACKAGED_CONTAINER_NOT_UPDATE);
} else {
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java
View file @ 8e2d5c9b
......@@ -3748,6 +3748,23 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
if (orderDO == null) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_NOT_EXISTS);
}
if (orderDO.getShipmentState() == 0
|| orderDO.getShipmentState() == 305
|| orderDO.getShipmentState() == 307
|| orderDO.getShipmentState() == 309
|| orderDO.getShipmentState() == 310
|| orderDO.getShipmentState() == 311
|| orderDO.getShipmentState() == 313
|| orderDO.getShipmentState() == 407
|| orderDO.getShipmentState() == 409
|| orderDO.getShipmentState() == 411) {
if (orderDO.getTransportId() == TransportTypeShortEnum.SEA_CONTAINER.getValue()) {
throw exception(ORDER_PRE_INSTALLATION_UNPACKAGED_CONTAINER_NOT_UPDATE);
} else {
// 当前不是海运就是空运
throw exception(ORDER_SORTING_NOT_SHIPMENT_NOT_UPDATE);
}
}
if (OrderStatusEnum.DRAFT.getValue().equals(orderDO.getStatus())) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_DRAFT_STATUS_NOT_ALLOWED_WAREHOUSE_IN);
}
......@@ -3867,6 +3884,23 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
if (orderDO == null) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_NOT_EXISTS);
}
if (orderDO.getShipmentState() == 0
|| orderDO.getShipmentState() == 305
|| orderDO.getShipmentState() == 307
|| orderDO.getShipmentState() == 309
|| orderDO.getShipmentState() == 310
|| orderDO.getShipmentState() == 311
|| orderDO.getShipmentState() == 313
|| orderDO.getShipmentState() == 407
|| orderDO.getShipmentState() == 409
|| orderDO.getShipmentState() == 411) {
if (orderDO.getTransportId() == TransportTypeShortEnum.SEA_CONTAINER.getValue()) {
throw exception(ORDER_PRE_INSTALLATION_UNPACKAGED_CONTAINER_NOT_UPDATE);
} else {
// 当前不是海运就是空运
throw exception(ORDER_SORTING_NOT_SHIPMENT_NOT_UPDATE);
}
}
if (OrderStatusEnum.WAREHOUSE_ADJUSTMENT.getValue().equals(orderDO.getStatus())) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_WAREHOUSE_ADJUSTMENT_STATUS_NOT_ALLOWED_WAREHOUSE_IN);
}
......
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
View file @ 8e2d5c9b
......@@ -179,6 +179,15 @@
<when test="status == 118428">
or (o.`status` = 32 AND o.shipment_State = 428 and o.transport_id = 3)
</when>
<when test="status == 16">
or (o.`status` = #{status} AND o.`pick_state` = 0)
</when>
<when test="status == 20">
or o.`pick_state` = 2
</when>
<when test="status == 21">
or o.`pick_state` = 1
</when>
<otherwise>
or o.`status` = #{status}
</otherwise>
......
yudao-module-product/yudao-module-product-core/src/main/resources/mapper/product/ProductPriceMapper.xml
View file @ 8e2d5c9b
......@@ -287,17 +287,26 @@
<if test="params.startCityId != null">
and ew_start.shi = #{params.startCityId}
</if>
<if test="params.destCityId != null">
and ew_dest.shi = #{params.destCityId}
<if test="params.destCityId != null and params.destCityId.size()>0 ">
and ew_dest.`shi` in
<foreach item='destCity' index='index' collection='params.destCityId' open='(' separator=',' close=')'>
#{destCity}
</foreach>
</if>
<!--目的国-->
<if test="params.destCountryId != null">
and ew_dest.guojia=#{params.destCountryId}
<if test="params.destCountryId != null and params.destCountryId.size()>0 ">
and ew_dest.`guojia` in
<foreach item='destCountry' index='index' collection='params.destCountryId' open='(' separator=',' close=')'>
#{destCountry}
</foreach>
</if>
<!--目的仓-->
<if test="params.destWarehouseId != null">
and ew_dest.id=#{params.destWarehouseId}
<if test="params.destWarehouseId != null and params.destWarehouseId.size()>0 ">
and ew_dest.`id` in
<foreach item='destWarehouse' index='index' collection='params.destWarehouseId' open='(' separator=',' close=')'>
#{destWarehouse}
</foreach>
</if>
<if test="params.blacklist != null">
......@@ -416,17 +425,26 @@
<if test="params.startCityId != null">
and ew_start.shi = #{params.startCityId}
</if>
<if test="params.destCityId != null">
and ew_dest.shi = #{params.destCityId}
<if test="params.destCityId != null and params.destCityId.size()>0 ">
and ew_dest.`shi` in
<foreach item='destCity' index='index' collection='params.destCityId' open='(' separator=',' close=')'>
#{destCity}
</foreach>
</if>
<!--目的国-->
<if test="params.destCountryId != null">
and ew_dest.guojia=#{params.destCountryId}
<if test="params.destCountryId != null and params.destCountryId.size()>0 ">
and ew_dest.`guojia` in
<foreach item='destCountry' index='index' collection='params.destCountryId' open='(' separator=',' close=')'>
#{destCountry}
</foreach>
</if>
<!--目的仓-->
<if test="params.destWarehouseId != null">
and ew_dest.id=#{params.destWarehouseId}
<if test="params.destWarehouseId != null and params.destWarehouseId.size()>0 ">
and ew_dest.`id` in
<foreach item='destWarehouse' index='index' collection='params.destWarehouseId' open='(' separator=',' close=')'>
#{destWarehouse}
</foreach>
</if>
<if test="params.blacklist != null">
......
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentReceivableExcelExportListener2.java
View file @ 8e2d5c9b
......@@ -126,11 +126,9 @@ public class ShipmentReceivableExcelExportListener2 {
} else {
if (warehouseLineDO.getTzName().equals("广州市捷道国际货运代理有限公司")) {
sTemName = "/nrlyReceivable2.xlsx";
}
else if (warehouseLineDO.getTzName().equals("广州市捷佳国际货运代理有限公司")) {
} else if (warehouseLineDO.getTzName().equals("广州市捷佳国际货运代理有限公司")) {
sTemName = "/nrlyReceivable3.xlsx";
}
else if (warehouseLineDO.getTzName().equals("义乌市捷道国际货运代理有限公司")) {
} else if (warehouseLineDO.getTzName().equals("义乌市捷道国际货运代理有限公司")) {
sTemName = "/nrlyReceivable4.xlsx";
} else {
sTemName = "/nrlyReceivable2.xlsx";
......@@ -299,11 +297,11 @@ public class ShipmentReceivableExcelExportListener2 {
Long orderId = entry.getKey();
OrderBackInfoDto orderInfo = orderQueryService.info(orderId);
Map<String, Object> map = new HashMap<>();
map.put("consigneeName", Objects.nonNull(orderInfo.getConsigneeVO())? orderInfo.getConsigneeVO().getName():"");
map.put("consigneeName", Objects.nonNull(orderInfo.getConsigneeVO()) ? orderInfo.getConsigneeVO().getName() : "");
map.put("mark", orderInfo.getMarks());
map.put("orderNo", orderInfo.getOrderNo());
map.put("tidanNo", orderInfo.getTidanNo());
map.put("consigneePhone", Objects.nonNull(orderInfo.getConsigneeVO())? ("+".concat(orderInfo.getConsigneeVO().getCountryCode()).concat(orderInfo.getConsigneeVO().getPhone())): "");
map.put("consigneePhone", Objects.nonNull(orderInfo.getConsigneeVO()) ? ("+".concat(orderInfo.getConsigneeVO().getCountryCode()).concat(orderInfo.getConsigneeVO().getPhone())) : "");
//todo 计算应收明细的核销比例,待测试，未减优惠金额
List<ReceivableOrderPayedFeeTypeVO> payedFeeTypeVOList = receivableService.getPayedMoneyByFeeType(orderId);
//应收运费
......@@ -537,8 +535,8 @@ public class ShipmentReceivableExcelExportListener2 {
stringBuffer.append(currencyMap.get(otherMainCurrency)).append("：").append(sum4).append(" ").append(currencyMap.get(otherAssisCurrency)).append("：").append(sum5);
}
headMap.put("otherFee", stringBuffer.toString());
headMap.put("otherFeeMain", currencyMap.get(otherMainCurrency)+"："+sum4);
headMap.put("otherFeeAssis", currencyMap.get(otherAssisCurrency)+"："+sum5);
headMap.put("otherFeeMain", currencyMap.get(otherMainCurrency) + "：" + sum4);
headMap.put("otherFeeAssis", currencyMap.get(otherAssisCurrency) + "：" + sum5);
File fileDir = new File(dir);
if (!fileDir.exists()) {
// 不存在则创建一个目录
......@@ -583,7 +581,7 @@ public class ShipmentReceivableExcelExportListener2 {
//业务数据从12行开始,22列为是否控货
Font font = workbook.createFont();
font.setColor(Font.COLOR_RED); //红色
CellStyle cellStyle=workbook.createCellStyle();
CellStyle cellStyle = workbook.createCellStyle();
cellStyle.setFont(font);
cellStyle.setAlignment(HorizontalAlignment.CENTER);
cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
......@@ -592,9 +590,9 @@ public class ShipmentReceivableExcelExportListener2 {
cellStyle.setBorderRight(BorderStyle.THIN);
cellStyle.setBorderTop(BorderStyle.THIN);
for (int i = 0; i < list.size(); i++) {
if (poiSheet.getRow(i+12).getCell(22).getStringCellValue().equals("YES")) {
if (poiSheet.getRow(i + 12).getCell(22).getStringCellValue().equals("YES")) {
for (int i1 = 0; i1 < 29; i1++) {
poiSheet.getRow(i+12).getCell(i1).setCellStyle(cellStyle);
poiSheet.getRow(i + 12).getCell(i1).setCellStyle(cellStyle);
}
}
}
......@@ -620,8 +618,7 @@ public class ShipmentReceivableExcelExportListener2 {
event.setFileId(fileDO.getId());
} catch (Exception e) {
e.printStackTrace();
event.setResult(e.getMessage());
event.setResult(e + "");
}
} else {
event.setResult("param fail");
......
yudao-server/src/main/resources/i18n/messages_en.properties
View file @ 8e2d5c9b
......@@ -664,7 +664,7 @@ param.customer.service.not=The customer or account manager is empty
order.warehouse.adjustment.status.not.allowed.warehouse.in=Non warehouse adjustment operations are not allowed during order warehouse adjustment
modify.approval.not.add.prod=Cannot add a new product after modification approval
modify.approval.not.update.warehouse.in=Cannot update or delete warehouse in after modification approval
consignee.phone.is.external=The recipient's mobile phone number must be from abroad
consignee.phone.is.external=The consignee's number cannot be a Chinese number
already.picked.up=The order has picked up
lading.not.make=bill of lading have not make yet
file.not.upload=The file has not uploaded
......
yudao-server/src/main/resources/i18n/messages_zh.properties
View file @ 8e2d5c9b
......@@ -672,7 +672,7 @@ already.picked.up=\u8BE5\u8BA2\u5355\u5DF2\u63D0\u8D27
lading.not.make=\u63D0\u5355\u672A\u5236\u4F5C
modify.approval.not.add.prod=\u4FEE\u6539\u5BA1\u6279\u4E0D\u80FD\u6DFB\u52A0\u65B0\u7684\u5546\u54C1
modify.approval.not.update.warehouse.in=\u5165\u4ED3\u4FEE\u6539\u5BA1\u6279\u4E2D\u4E0D\u80FD\u4FEE\u6539\u6216\u5220\u9664\u5165\u4ED3\u7EAA\u5F55
consignee.phone.is.external=\u6536\u8D27\u4EBA\u624B\u673A\u53F7\u7801\u5FC5\u987B\u662F\u56FD\u5916\u7684
consignee.phone.is.external=\u6536\u8D27\u4EBA\u624B\u673A\u53F7\u7801\u4E0D\u80FD\u662F\u56FD\u5185\u53F7\u7801
file.not.upload=\u8BE5\u6587\u4EF6\u672A\u4E0A\u4F20
your.customer.information.is.incomplete=\u60A8\u7684\u5BA2\u6237\u4FE1\u606F\u672A\u5B8C\u5584\uFF01\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01
open.sea.customer.cannot.set.air=\u5BA2\u6237\u3010{}\u3011\u5728\u516C\u6D77\u4E2D\u4E0D\u53EF\u8BBE\u7F6E\u662F\u5426\u7A7A\u8FD0\u5BA2\u6237
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment