Skip to content

J
jiedao-api-boot-master
Commit 3c26c256 authored by zhengyi's avatar zhengyi
Browse files
Options

Merge branch 'dev' into zhengyi_dev

parents 4bea202b b4f311ca
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 81 deletions
sql/v2.1/20241125.sql 0 → 100644
View file @ 3c26c256
-- 补充菜单按钮脚本
INSERT INTO `system_menu` (`name`, `permission`, `menu_type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `is_show_in_menu_bar`, `name_en`, `keepalive`, `redirect`, `badge_field`) VALUES ('撤销到仓', 'order:warehouse:check:revoke', 3, 21, 1559, '', '#', '', 0, '2702', '2024-11-03 18:52:39', '2702', '2024-11-03 18:59:08', b'0', b'0', '撤销到仓', b'0', NULL, NULL);
INSERT INTO `system_menu` (`name`, `permission`, `menu_type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `is_show_in_menu_bar`, `name_en`, `keepalive`, `redirect`, `badge_field`) VALUES ('强制到仓', 'order:warehouse:check:force', 3, 22, 1559, '', '#', '', 0, '2702', '2024-11-03 18:52:39', '2702', '2024-11-03 18:59:08', b'0', b'0', '强制到仓', b'0', NULL, NULL);
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java
View file @ 3c26c256
......@@ -440,6 +440,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
throw exception(ORDER_NOT_EXISTS);
}
orderDO.setOrderType(orderType);
orderDO.setPickleType(1); // 这里每次设置订单类型都需要重置半泡属性
handleException(orderId, orderDO, 9);
}
......
yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/coupon/CouponMapper.java
View file @ 3c26c256
......@@ -306,41 +306,30 @@ public interface CouponMapper extends BaseMapperX<CouponDO> {
"<when test = 'reqVO.status != null'>",
"AND c.status = #{reqVO.status}",
"</when>",
"<when test='reqVO.statusList != null and reqVO.statusList.size()>0 and reqVO.isIncludeExpiredStatus == false' >",
"<when test='reqVO.statusList.size()==1'>",
" AND c.`status` = ",
" <foreach item='statusId' index='index' collection='reqVO.statusList' >",
" #{statusId}",
" </foreach>" ,
" </when>",
" <when test='reqVO.statusList != null and reqVO.statusList.size()>1'>",
" AND c.`status` in ",
" <foreach item='statusId' index='index' collection='reqVO.statusList' open='(' separator=',' close=')'>",
" #{statusId}",
" </foreach>",
" </when>",
"</when>",
"<when test='reqVO.statusList != null and reqVO.statusList.size()>0 and reqVO.isIncludeExpiredStatus == true' >",
"AND ( 1 != 1",
"<when test = 'reqVO.overdueStatus != null'>",
"or (c.overdue_status = #{reqVO.overdueStatus} and c.`puton_status` = 1)",
"</when>",
"<when test='reqVO.statusList.size()==1'>",
" or c.`status` = ",
" <foreach item='statusId' index='index' collection='reqVO.statusList' >",
" #{statusId}",
" </foreach>" ,
" </when>",
" <when test='reqVO.statusList != null and reqVO.statusList.size()>1'>",
" AND c.`status` in ",
" <foreach item='statusId' index='index' collection='reqVO.statusList' open='(' separator=',' close=')'>",
" #{statusId}",
" </foreach>",
" </when>",
"<when test='reqVO.statusList != null and reqVO.statusList.size()>0 ' >",
"AND ( 1 != 1",
"<foreach item='status' index='index' collection='reqVO.statusList'>",
"<choose>",
"<when test=' status == 0'>",
" or c.`status` = #{status}",
"</when>",
"<when test=' status == 1'>",
" or c.`status` = #{status}",
"</when>",
"<when test=' status == 2'>",
" or (c.`status` = 1 and (c.`puton_status` = 0 or c.`puton_status` = -1))",
"</when>",
"<when test=' status == 3'>",
" or (c.`status` = 1 and c.`puton_status` = 1)",
"</when>",
"<when test=' status == 4'>",
" or c.`overdue_status` = 0",
"</when>",
"</choose>",
"</foreach>",
" )",
"</when>",
"<when test = 'reqVO.overdueStatus != null and reqVO.isIncludeExpiredStatus == false'>",
"<when test = 'reqVO.overdueStatus != null '>",
"AND c.overdue_status = #{reqVO.overdueStatus} and c.`puton_status` = 1",
"</when>",
"<when test = 'reqVO.putonStatus != null'>",
......
yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/product/ProductMapper.java
View file @ 3c26c256
......@@ -165,13 +165,12 @@ public interface ProductMapper extends BaseMapperX<ProductDO> {
"</when>",
"<when test='query.attrId != null and query.attrId.size()>0'>" ,
"<when test=' query.attrId.size()==1 '>" ,
"<when test='query.attrId.size()==1 '>" ,
"<foreach item='attrId' index='index' collection='query.attrId' >" ,
"AND t.`attr_id` = #{attrId}" ,
"</foreach>",
"</when>",
"<when test='and query.attrId.size()>1 '>" ,
"<when test='query.attrId.size()>1 '>" ,
"AND (1!=1 " ,
" <foreach item='attrId' index='index' collection='query.attrId'>" ,
" OR FIND_IN_SET(t.`attr_id`, #{attrId})",
......
yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/coupon/impl/CouponServiceImpl.java
View file @ 3c26c256
......@@ -1265,21 +1265,6 @@ public class CouponServiceImpl extends AbstractService<CouponMapper, CouponDO> i
@Override
public PageResult<CouponDO> getCouponPage(CouponPageReqVO pageReqVO) {
pageReqVO.setIncludeExpiredStatus(false);
if (CollectionUtil.isNotEmpty(pageReqVO.getStatusList())){
if (pageReqVO.getStatusList().contains(2)){
// 包含已过期状态
pageReqVO.setOverdueStatus(false);
if (pageReqVO.getStatusList().size() == 1){
pageReqVO.setStatusList(null);
}else {
// 这里调用的方法需要传包装类型，传常量2是另一种执行逻辑，所以需要将状态2重新定义为包装类型
Integer status = 2;
pageReqVO.getStatusList().remove(status);
pageReqVO.setIncludeExpiredStatus(true);
}
}
}
PageVO page = new PageVO();
page.setField("c.coupon_id DESC");
page.setRows(pageReqVO.getPageSize());
......
yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/vo/coupon/CouponPageReqVO.java
View file @ 3c26c256
......@@ -134,8 +134,8 @@ public class CouponPageReqVO extends PageParam {
@ApiModelProperty(value = "关键字")
private String searchKey;
@ApiModelProperty(value = "是否组合状态")
private boolean isIncludeExpiredStatus = false;
//
// @ApiModelProperty(value = "是否组合状态")
// private boolean isIncludeExpiredStatus = false;
}
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java
View file @ 3c26c256
......@@ -307,39 +307,41 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
// 提单直接审批通过
updateObj.setStatus(2);
//end 提单直接审批通过
if (null != updateReqVO.getNeedBackend() && updateReqVO.getNeedBackend()) {
OrderDO order = orderQueryService.getOrderById(Long.valueOf(makeBillOfLading.getOrderId()));
OrderDO order = orderQueryService.getOrderById(Long.valueOf(makeBillOfLading.getOrderId()));
OrderObjectiveDO orderObjectiveDO = orderObjectiveService.getByOrderId(order.getOrderId());
OrderObjectiveDO orderObjectiveDO = orderObjectiveService.getByOrderId(order.getOrderId());
//得到订单目的仓
String destStr = "";
if (null != orderObjectiveDO && null != orderObjectiveDO.getObjectiveWarehouseId()) {
WarehouseDO warehouseDO = warehouseService.getWarehouse(orderObjectiveDO.getObjectiveWarehouseId());
destStr = warehouseDO.getTitleEn();
}
//得到订单目的仓
String destStr = "";
if (null != orderObjectiveDO && null != orderObjectiveDO.getObjectiveWarehouseId()) {
WarehouseDO warehouseDO = warehouseService.getWarehouse(orderObjectiveDO.getObjectiveWarehouseId());
destStr = warehouseDO.getTitleEn();
}
if (StrUtil.isBlank(order.getContainerNumber())) {
throw exception(MAKE_BILL_OF_SELF_NULL);
}
if (StrUtil.isBlank(order.getTidanNo())) {
throw exception(MAKE_BILL_OF_ORDER_NULL);
}
if (StrUtil.isBlank(order.getContainerNumber())) {
throw exception(MAKE_BILL_OF_SELF_NULL);
}
if (StrUtil.isBlank(order.getTidanNo())) {
throw exception(MAKE_BILL_OF_ORDER_NULL);
}
FileClient masterFileClient = fileConfigService.getMasterFileClient();
String domain = masterFileClient.getDomain();
//创建空运的PDF提单
String pdfFileName = "/admin/shipment/" + StrUtil.blankToDefault(order.getContainerNumber(), "") + "/pdf/" + StrUtil.blankToDefault(order.getTidanNo(), "") + " " + StrUtil.blankToDefault(order.getMarks(), "") + " " + StrUtil.blankToDefault(destStr, "") + ".pdf";
String pdfUrl = domain + pdfFileName;
String pdfPath = prePath + pdfFileName;
try {
AirHtmlToPdfUtil.convertHtmlToPdf(updateObj.getBillContent(), pdfPath);
} catch (Exception e) {
throw new RuntimeException(e);
FileClient masterFileClient = fileConfigService.getMasterFileClient();
String domain = masterFileClient.getDomain();
//创建空运的PDF提单
String pdfFileName = "/admin/shipment/" + StrUtil.blankToDefault(order.getContainerNumber(), "") + "/pdf/" + StrUtil.blankToDefault(order.getTidanNo(), "") + " " + StrUtil.blankToDefault(order.getMarks(), "") + " " + StrUtil.blankToDefault(destStr, "") + ".pdf";
String pdfUrl = domain + pdfFileName;
String pdfPath = prePath + pdfFileName;
try {
AirHtmlToPdfUtil.convertHtmlToPdf(updateObj.getBillContent(), pdfPath);
} catch (Exception e) {
throw new RuntimeException(e);
}
//设置生成的PDF路径
updateObj.setImgUrl(pdfUrl);
}
//设置生成的PDF路径
updateObj.setImgUrl(pdfUrl);
/*
String bpmProcessId =
bpmCreateServiceFactory.createBmp(SecurityFrameworkUtils.getLoginUserId(),
......
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