code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg

Browse Source
This commit is contained in:
misworga831
2025-10-11 11:49:51 +09:00
parent f658d43a5a fe0b9c37a4
commit c813ed0062
4 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DB/version4.3to4.4.sql
View File

@@ -164,4 +164,10 @@ ALTER TABLE `li_store_flow` ADD `profit_sharing` varchar(255) NULL COMMENT '分
INSERT INTO `lilishop`.`li_setting` (`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `setting_value`) VALUES ('CONNECT_SETTING', 'admin', '2024-07-07 13:55:38.686000', b'0', NULL, NULL, '{\"callbackUrl\":\"https://buyer-api.pickmall.cn\",\"pc\":\"https://pc-b2b2c.pickmall.cn\",\"wap\":\"https://m-b2b2c.pickmall.cn\"}'); INSERT INTO `lilishop`.`li_setting` (`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `setting_value`) VALUES ('CONNECT_SETTING', 'admin', '2024-07-07 13:55:38.686000', b'0', NULL, NULL, '{\"callbackUrl\":\"https://buyer-api.pickmall.cn\",\"pc\":\"https://pc-b2b2c.pickmall.cn\",\"wap\":\"https://m-b2b2c.pickmall.cn\"}');
UPDATE `lilishop`.`li_setting` SET `create_by` = 'admin', `create_time` = '2021-01-23 02:18:03.299000', `delete_flag` = b'0', `update_by` = 'admin', `update_time` = '2024-07-07 13:53:44.732000', `setting_value` = '{\"accessKeyId\":\"test\",\"tencentSdkAppId\":\"null\",\"registerTemplateCode\":\"SMS_205755298\",\"huaweiSender\":\"null\",\"signName\":\"lili\",\"tencentSecretId\":\"null\",\"huaweiAppKey\":\"null\",\"isTestModel\":\"true\",\"tencentSecretKey\":\"null\",\"type\":\"ALI\",\"accessSecret\":\"test\",\"tencentSignName\":\"null\",\"huaweiSignature\":\"null\",\"payPasswordTemplateCode\":\"SMS_205755301\",\"walletPasswordTemplateCode\":\"SMS_205755297\",\"findPasswordTemplateCode\":\"SMS_205755301\",\"huaweiAppSecret\":\"null\",\"loginTemplateCode\":\"SMS_205755300\"}' WHERE `id` = 'SMS_SETTING'; UPDATE `lilishop`.`li_setting` SET `create_by` = 'admin', `create_time` = '2021-01-23 02:18:03.299000', `delete_flag` = b'0', `update_by` = 'admin', `update_time` = '2024-07-07 13:53:44.732000', `setting_value` = '{\"accessKeyId\":\"test\",\"tencentSdkAppId\":\"null\",\"registerTemplateCode\":\"SMS_205755298\",\"huaweiSender\":\"null\",\"signName\":\"lili\",\"tencentSecretId\":\"null\",\"huaweiAppKey\":\"null\",\"isTestModel\":\"true\",\"tencentSecretKey\":\"null\",\"type\":\"ALI\",\"accessSecret\":\"test\",\"tencentSignName\":\"null\",\"huaweiSignature\":\"null\",\"payPasswordTemplateCode\":\"SMS_205755301\",\"walletPasswordTemplateCode\":\"SMS_205755297\",\"findPasswordTemplateCode\":\"SMS_205755301\",\"huaweiAppSecret\":\"null\",\"loginTemplateCode\":\"SMS_205755300\"}' WHERE `id` = 'SMS_SETTING';
ALTER TABLE li_store_logistics ADD `partner_name` varchar(255) DEFAULT NULL COMMENT '电子面单客户账户名称';

18
consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java
View File

@@ -4,6 +4,8 @@ import cn.lili.common.utils.CurrencyUtil;
import cn.lili.event.AfterSaleStatusChangeEvent; import cn.lili.event.AfterSaleStatusChangeEvent;
import cn.lili.event.TradeEvent; import cn.lili.event.TradeEvent;
import cn.lili.modules.order.aftersale.entity.dos.AfterSale; import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
import cn.lili.modules.order.aftersale.service.AfterSaleService;
import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderItem; import cn.lili.modules.order.order.entity.dos.OrderItem;
@@ -34,6 +36,8 @@ public class OrderStatusHandlerExecute implements TradeEvent, AfterSaleStatusCha
private OrderItemService orderItemService; private OrderItemService orderItemService;
@Autowired @Autowired
private OrderService orderService; private OrderService orderService;
@Autowired
private AfterSaleService afterSaleService;
@Override @Override
public void orderCreate(TradeDTO tradeDTO) { public void orderCreate(TradeDTO tradeDTO) {
@@ -64,14 +68,20 @@ public class OrderStatusHandlerExecute implements TradeEvent, AfterSaleStatusCha
int returnCount = 0; int returnCount = 0;
// 总购买数量 // 总购买数量
int deliverCount = 0; int deliverCount = 0;
for (OrderItem item : orderItems) { //获取订单货物已完成售后的数量
returnCount += item.getReturnGoodsNumber(); AfterSaleSearchParams saleSearchParams = new AfterSaleSearchParams();
deliverCount += item.getNum(); saleSearchParams.setOrderSn(afterSale.getOrderSn());
saleSearchParams.setServiceStatus(AfterSaleStatusEnum.COMPLETE.name());
List<AfterSale> afterSales = afterSaleService.exportAfterSaleOrder(saleSearchParams);
for (AfterSale sale : afterSales) {
returnCount += sale.getNum();
} }
//订单货物购买总数
deliverCount = order.getGoodsNum();
if (returnCount == deliverCount) { if (returnCount == deliverCount) {
orderService.systemCancel(afterSale.getOrderSn(),"订单货物全部退款",false); orderService.systemCancel(afterSale.getOrderSn(),"订单货物全部退款",false);
} }
} }
} }
} }

27
framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java
View File

@@ -86,20 +86,23 @@ public class AfterSaleSearchParams extends PageVO {
if (CharSequenceUtil.isNotEmpty(orderSn)) { if (CharSequenceUtil.isNotEmpty(orderSn)) {
queryWrapper.like("order_sn", orderSn); queryWrapper.like("order_sn", orderSn);
} }
//按买家查询 if(UserContext.getCurrentUser() != null){
if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MEMBER.name())) { //按买家查询
queryWrapper.eq("member_id", UserContext.getCurrentUser().getId()); if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MEMBER.name())) {
} queryWrapper.eq("member_id", UserContext.getCurrentUser().getId());
//按卖家查询 }
if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name())) { //按卖家查询
queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId()); if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name())) {
queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId());
}
if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MANAGER.name())
&& CharSequenceUtil.isNotEmpty(storeId)
) {
queryWrapper.eq("store_id", storeId);
}
} }
if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MANAGER.name())
&& CharSequenceUtil.isNotEmpty(storeId)
) {
queryWrapper.eq("store_id", storeId);
}
if (CharSequenceUtil.isNotEmpty(memberName)) { if (CharSequenceUtil.isNotEmpty(memberName)) {
queryWrapper.like("member_name", memberName); queryWrapper.like("member_name", memberName);
} }

4
manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java
View File

@@ -80,9 +80,9 @@ public class GoodsManagerController {
@ApiImplicitParam(name = "authFlag", value = "审核结果", required = true, paramType = "query", dataType = "string") @ApiImplicitParam(name = "authFlag", value = "审核结果", required = true, paramType = "query", dataType = "string")
}) })
@PutMapping(value = "auth") @PutMapping(value = "auth")
public ResultMessage<Object> auth(@RequestParam List<String> goodsId, @RequestParam String authFlag) { public ResultMessage<Object> auth(@RequestParam List<String> goodsIds, @RequestParam String authFlag) {
//校验商品是否存在 //校验商品是否存在
if (goodsService.auditGoods(goodsId, GoodsAuthEnum.valueOf(authFlag))) { if (goodsService.auditGoods(goodsIds, GoodsAuthEnum.valueOf(authFlag))) {
return ResultUtil.success(); return ResultUtil.success();
} }
throw new ServiceException(ResultCode.GOODS_AUTH_ERROR); throw new ServiceException(ResultCode.GOODS_AUTH_ERROR);