backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

装修出问题后，暂恢复 diy html js 文件

Browse Source
This commit is contained in:
Jack 2025-11-14 23:23:29 +08:00
parent 8c3c81d523
commit bd6d44ebd9
9 changed files with 47263 additions and 22718 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mall-common/src/main/java/com/suisung/mall/common/api/StateCode.java
View File

@ -450,6 +450,11 @@ public class StateCode {
public static final int SF_ORDER_STATUS_EXCEPTION = 91; public static final int SF_ORDER_STATUS_EXCEPTION = 91;
public static final int SF_ORDER_STATUS_CANCELING = 31; public static final int SF_ORDER_STATUS_CANCELING = 31;
// 退款状态:0-是无退款;1-是部分退款;2-是全部退款
public static final int ORDER_REFUND_STATUS_NO = 0;
public static final int ORDER_REFUND_STATUS_PART = 1;
public static final int ORDER_REFUND_STATUS_ALL = 2;
static { static {
DELIVERY_TIME_NOT_TIMER.put(1, I18nUtil._("不限时段")); DELIVERY_TIME_NOT_TIMER.put(1, I18nUtil._("不限时段"));
DELIVERY_TIME_NOT_TIMER.put(15, I18nUtil._("上午")); DELIVERY_TIME_NOT_TIMER.put(15, I18nUtil._("上午"));

2
mall-shop/src/main/java/com/suisung/mall/shop/components/quartz/job/UpdateActivityStatusJob.java
View File

@ -65,7 +65,7 @@ public class UpdateActivityStatusJob extends QuartzJobBean {
page++; page++;
} }
// 更新砍价订单的过期状态 // 活动时间到更新砍价订单的过期状态
shopActivityCutpriceService.autoUpdateCutPriceStateJob(); shopActivityCutpriceService.autoUpdateCutPriceStateJob();
} }

4
mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
View File

@ -7873,8 +7873,8 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
data_row.setOrder_redpacket_price(BigDecimal.ZERO); // 红包抵扣订单金额 data_row.setOrder_redpacket_price(BigDecimal.ZERO); // 红包抵扣订单金额
data_row.setOrder_resource_ext1(order_resource_ext1_use_current); data_row.setOrder_resource_ext1(order_resource_ext1_use_current);
data_row.setOrder_resource_ext2(order_resource_ext2_use); data_row.setOrder_resource_ext2(order_resource_ext2_use);
data_row.setOrder_refund_status(0); // 退款状态:0-是无退款;1-是部分退款;2-是全部退款 data_row.setOrder_refund_status(StateCode.ORDER_REFUND_STATUS_NO); // 退款状态:0-是无退款;1-是部分退款;2-是全部退款
data_row.setOrder_return_status(0); // 退货状态(ENUM):0-是无退货;1-是部分退货;2-是全部退货 data_row.setOrder_return_status(StateCode.ORDER_REFUND_STATUS_NO); // 退货状态(ENUM):0-是无退货;1-是部分退货;2-是全部退货
data_row.setOrder_return_num(0); // 退货数量 data_row.setOrder_return_num(0); // 退货数量
BigDecimal order_item_commission_fee = item_rows.stream().map(s -> s.getOrder_item_commission_fee()).reduce(BigDecimal::add).get(); BigDecimal order_item_commission_fee = item_rows.stream().map(s -> s.getOrder_item_commission_fee()).reduce(BigDecimal::add).get();

14
mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
View File

@ -1063,6 +1063,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
if (shopOrderData == null) { if (shopOrderData == null) {
throw new ApiException(I18nUtil._("订单详细信息为空！")); throw new ApiException(I18nUtil._("订单详细信息为空！"));
} }
for (ShopOrderReturnItem orderReturnItem : orderReturnItems) { for (ShopOrderReturnItem orderReturnItem : orderReturnItems) {
ShopOrderItem order_item_row = order_item_rows.stream().filter(s -> s.getOrder_item_id().equals(orderReturnItem.getOrder_item_id())).findFirst().orElse(null); ShopOrderItem order_item_row = order_item_rows.stream().filter(s -> s.getOrder_item_id().equals(orderReturnItem.getOrder_item_id())).findFirst().orElse(null);
@ -1503,7 +1504,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
if (productItem == null) { if (productItem == null) {
logger.error("该订单商品表-SKU表信息不存在！商品项ID: {}", itemId);//说明这个itemid已经不存在了，不对库存操作 logger.error("该订单商品表-SKU表信息不存在！商品项ID: {}", itemId);//说明这个itemid已经不存在了，不对库存操作
continue; continue;
// throw new ApiException(I18nUtil._("该订单商品表-SKU表信息不存在！")); // throw new ApiException(I18nUtil._("该订单商品表-SKU表信息不存在！"));
} }
// 增加库存 // 增加库存
@ -1526,8 +1527,8 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
// RMK 第三方数据同步相关：redis 新增返还思迅库存 // RMK 第三方数据同步相关：redis 新增返还思迅库存
Map<String, Integer> stockDeltaMap = new HashMap<>(); Map<String, Integer> stockDeltaMap = new HashMap<>();
String item_src_id = productItem.getItem_src_id(); String item_src_id = productItem.getItem_src_id();
stockDeltaMap.put(item_src_id + "-" + shopOrderItem.getOrder_id()+"-"+shopOrderItem.getItem_unit_price(), returnNum); stockDeltaMap.put(item_src_id + "-" + shopOrderItem.getOrder_id() + "-" + shopOrderItem.getItem_unit_price(), returnNum);
syncThirdDataService.incrProductStockToRedis(stockDeltaMap,returnItem.getReturn_item_subtotal()); syncThirdDataService.incrProductStockToRedis(stockDeltaMap, returnItem.getReturn_item_subtotal());
logger.info("退货返回给思迅,存入redis成功,item_src_id:{},订单号：{},数量：{}", item_src_id, shopOrderReturn.getOrder_id(), returnNum); logger.info("退货返回给思迅,存入redis成功,item_src_id:{},订单号：{},数量：{}", item_src_id, shopOrderReturn.getOrder_id(), returnNum);
} else { } else {
logger.warn("退货数量为空，无法增加库存，订单项ID: {}", orderItemId); logger.warn("退货数量为空，无法增加库存，订单项ID: {}", orderItemId);
@ -1594,7 +1595,8 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
ShopOrderData shopOrderData = new ShopOrderData(); ShopOrderData shopOrderData = new ShopOrderData();
shopOrderData.setOrder_id(order_id); shopOrderData.setOrder_id(order_id);
shopOrderData.setOrder_refund_status(2); //退款状态:0-是无退款;1-是部分退款;2-是全部退款 shopOrderData.setOrder_refund_status(StateCode.ORDER_REFUND_STATUS_ALL); //退款状态:0-是无退款;1-是部分退款;2-是全部退款
shopOrderData.setOrder_return_status(StateCode.ORDER_REFUND_STATUS_ALL);
if (!shopOrderDataService.edit(shopOrderData)) { if (!shopOrderDataService.edit(shopOrderData)) {
logger.error("修改订单退款状态失败！订单ID: {}", order_id); logger.error("修改订单退款状态失败！订单ID: {}", order_id);
throw new ApiException(ResultCode.FAILED); throw new ApiException(ResultCode.FAILED);
@ -1671,7 +1673,9 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
logger.debug("订单部分商品退款，订单ID: {}", order_id); logger.debug("订单部分商品退款，订单ID: {}", order_id);
ShopOrderData orderData = new ShopOrderData(); ShopOrderData orderData = new ShopOrderData();
orderData.setOrder_id(order_id); orderData.setOrder_id(order_id);
orderData.setOrder_refund_status(CommonConstant.Enable); // 退款状态:0-是无退款;1-是部分退款;2-是全部退款
orderData.setOrder_refund_status(StateCode.ORDER_REFUND_STATUS_PART);
orderData.setOrder_return_status(StateCode.ORDER_REFUND_STATUS_PART);
if (!shopOrderDataService.edit(orderData)) { if (!shopOrderDataService.edit(orderData)) {
logger.error("部分退款失败！订单ID: {}", order_id); logger.error("部分退款失败！订单ID: {}", order_id);
throw new ApiException(I18nUtil._("部分退款失败！")); throw new ApiException(I18nUtil._("部分退款失败！"));

2
mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
View File

@ -703,7 +703,7 @@
<!-- 3-退款订单 --> <!-- 3-退款订单 -->
<when test="status != null and status == 3"> <when test="status != null and status == 3">
AND od.order_refund_status IN (1, 2) AND od.order_refund_status IN (1, 2)
AND ob.order_state_id = 2070 <!-- AND ob.order_state_id = 2070-->
</when> </when>
<!-- 9-已完成订单 --> <!-- 9-已完成订单 -->
<when test="status != null and status == 9"> <when test="status != null and status == 9">

40641
mall-shop/src/main/resources/static/diy/js/diy.js
View File

File diff suppressed because one or more lines are too long

21605
mall-shop/src/main/resources/static/diy/js/diy.js.bak1114 Normal file
View File

File diff suppressed because one or more lines are too long

2119
mall-shop/src/main/resources/templates/diy.html
View File

File diff suppressed because one or more lines are too long

5589
mall-shop/src/main/resources/templates/diy.html.bak1114 Normal file
View File

File diff suppressed because one or more lines are too long