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

sql/yshop3.2.sql

@@ -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);
 
 
 -- ----------------------------

sql/新增售后相关sql增量sql

@@ -48,3 +48,8 @@ INSERT INTO `menu` VALUES (266, b'0', '售后', 'shop/afterSeals/index', 53, 44,
 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 `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);

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

@@ -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);
 

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

@@ -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(),