cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

售后菜单、是否退运费修改

Browse Source
This commit is contained in:
taozi
2023-04-29 15:49:24 +08:00
parent 0e70360afd
commit b8fff738a2
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/yshop3.2.sql
View File

@ -1375,6 +1375,10 @@ INSERT INTO `roles_menus` VALUES (262, 1);
INSERT INTO `roles_menus` VALUES (263, 1);
INSERT INTO `roles_menus` VALUES (264, 1);
INSERT INTO `roles_menus` VALUES (265, 1);
INSERT INTO `roles_menus` VALUES (266, 1);
INSERT INTO `roles_menus` VALUES (267, 1);
INSERT INTO `roles_menus` VALUES (268, 1);
INSERT INTO `roles_menus` VALUES (269, 1);
-- ----------------------------

7
sql/新增售后相关sql增量sql
View File

@ -47,4 +47,9 @@ ALTER TABLE yx_store_order_cart_info ADD COLUMN is_after_sales tinyint(1) unsign
INSERT INTO `menu` VALUES (266, b'0', '售后', 'shop/afterSeals/index', 53, 44, 'order', 'afterSeals', b'0', b'0', 'AfterSeals', '2021-06-30 15:23:38', 'yxStoreAfterSales:list', 1, '2021-06-30 15:33:14', 0);
INSERT INTO `menu` VALUES (267, b'0', '新增', NULL, 266, 999, NULL, NULL, b'0', b'0', '-', '2021-06-30 15:34:17', 'yxStoreAfterSales:add', 2, NULL, 0);
INSERT INTO `menu` VALUES (268, b'0', '修改', NULL, 266, 999, NULL, NULL, b'0', b'0', '-', '2021-06-30 15:34:39', 'yxStoreAfterSales:edit', 2, NULL, 0);
INSERT INTO `menu` VALUES (269, b'0', '删除', NULL, 266, 999, NULL, NULL, b'0', b'0', '-', '2021-06-30 15:34:55', 'yxStoreAfterSales:del', 2, NULL, 0);
INSERT INTO `menu` VALUES (269, b'0', '删除', NULL, 266, 999, NULL, NULL, b'0', b'0', '-', '2021-06-30 15:34:55', 'yxStoreAfterSales:del', 2, NULL, 0);
INSERT INTO `roles_menus` VALUES (266, 1);
INSERT INTO `roles_menus` VALUES (267, 1);
INSERT INTO `roles_menus` VALUES (268, 1);
INSERT INTO `roles_menus` VALUES (269, 1);

3
yshop-mall/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java
View File

@ -89,7 +89,8 @@ public class StoreAfterSalesServiceImpl extends BaseServiceImpl<StoreAfterSalesM
BigDecimal commodityDiscountAmount = NumberUtil.mul(NumberUtil.div(totalAmountOfGoods, NumberUtil.sub(yxStoreOrder.getTotalPrice(), yxStoreOrder.getPayPostage())), yxStoreOrder.getCouponPrice());
//商品优惠后总金额
totalPrice = NumberUtil.add(totalPrice, NumberUtil.sub(totalAmountOfGoods, commodityDiscountAmount));
// todo 根据自己的业务逻辑修改，是否退运费，默认退运费
totalPrice = NumberUtil.add(totalPrice, yxStoreOrder.getPayPostage());
yxStoreOrderCartInfo.setIsAfterSales(0);
storeOrderCartInfoMapper.updateById(yxStoreOrderCartInfo);

2
yshop-shop/src/main/java/co/yixiang/modules/sales/StoreAfterSalesController.java
View File

@ -24,6 +24,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -57,6 +58,7 @@ public class StoreAfterSalesController {
@ApiOperation("审核")
@PreAuthorize("@el.check('admin','yxStoreAfterSales:edit')")
@PostMapping(value = "/salesCheck")
@Transactional
public ResponseEntity salesCheck(@RequestBody SalesCheckDto salesCheckDto) {
Object salesCheck = storeAfterSalesService.salesCheck(salesCheckDto.getSalesId(), salesCheckDto.getOrderCode(),
salesCheckDto.getApprovalStatus(), salesCheckDto.getConsignee(), salesCheckDto.getPhoneNumber(),