优化

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java

@@ -61,6 +61,7 @@ public interface ErrorCodeConstants {
     ErrorCode CARD_NOT_EXISTS = new ErrorCode(1_004_013_000, "余额明细不存在");
     ErrorCode ORDER_NOT_EXISTS = new ErrorCode(1_004_013_001, "订单不存在");
     ErrorCode ORDER_STATUS_NOT_ALLOW = new ErrorCode(1_004_013_001, "未完成订单或异常订单不支持减免");
+    ErrorCode ORDER_MONEY_NOT_ENOUGH = new ErrorCode(1_004_013_001, "减免金额不能大于订单金额");
     ErrorCode ORDER_DETAIL_NOT_EXISTS = new ErrorCode(1_004_013_002, "订单明细不存在");
     ErrorCode RECHARGE_AMOUNT_NOT_EXISTS = new ErrorCode(1_004_013_003, "订单明细不存在");
     ErrorCode RECHARGE_AMOUNT_ALREADY_EXISTS = new ErrorCode(1_004_013_004, "该金额已存在");
@@ -217,5 +218,6 @@ public interface ErrorCodeConstants {
     ErrorCode ACTIVITY_MENU_NOT_EXISTS = new ErrorCode(1_005_000_25, "活动套餐不存在");
 
 
+
 }
 

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storegoodstype/StoreGoodsTypeController.java

@@ -1,33 +1,31 @@
 package cn.iocoder.yudao.module.member.controller.admin.storegoodstype;
 
-import org.springframework.web.bind.annotation.*;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
+import cn.iocoder.yudao.module.member.controller.admin.storegoodstype.vo.StoreGoodsTypePageReqVO;
-
+import cn.iocoder.yudao.module.member.controller.admin.storegoodstype.vo.StoreGoodsTypeRespVO;
-import cn.iocoder.yudao.module.member.controller.admin.storegoodstype.vo.*;
+import cn.iocoder.yudao.module.member.controller.admin.storegoodstype.vo.StoreGoodsTypeSaveReqVO;
 import cn.iocoder.yudao.module.member.dal.dataobject.storegoodstype.StoreGoodsTypeDO;
 import cn.iocoder.yudao.module.member.service.storegoodstype.StoreGoodsTypeService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 商品类别")
 @RestController
@@ -95,7 +93,7 @@ public class StoreGoodsTypeController {
     @GetMapping("/all")
     @Operation(summary = "获得商品类别分页")
     public CommonResult<List<StoreGoodsTypeRespVO>> getAll() {
-        List<StoreGoodsTypeDO> all = storeGoodsTypeService.getAll();
+        List<StoreGoodsTypeDO> all = storeGoodsTypeService.getAllDevice();
         return success(BeanUtils.toBean(all, StoreGoodsTypeRespVO.class));
     }
 

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/store/AppStoreController.java

@@ -74,7 +74,7 @@ public class AppStoreController {
         String equipment = request.getHeader("Authorization");
         Long storeId = cashregisterinfoApi.getStoreId(equipment);
         List<StoreGoodsDO> goodsDOS = storeGoodsService.getByCarteenId(storeId);
-        List<StoreGoodsTypeDO> goodsTypeDOS = goodsTypeService.getAll();
+        List<StoreGoodsTypeDO> goodsTypeDOS = goodsTypeService.getAllDevice();
         List<StoreGoodsListVo> goodData = BeanUtils.toBean(goodsDOS, StoreGoodsListVo.class);
         List<StoreGoodsTypeListVo> categoryData = BeanUtils.toBean(goodsTypeDOS, StoreGoodsTypeListVo.class);
         GoodsResult goodsResult = new GoodsResult();
@@ -118,7 +118,7 @@ public class AppStoreController {
             return JsonUtils.toJsonString(goodsResult);
         }
         List<StoreGoodsDO> goodsDOS = storeGoodsService.getAll(goodsIds);
-        List<StoreGoodsTypeDO> goodsTypeDOS = goodsTypeService.getAll();
+        List<StoreGoodsTypeDO> goodsTypeDOS = goodsTypeService.getAllDevice();
         List<StoreGoodsListVo> goodData = BeanUtils.toBean(goodsDOS, StoreGoodsListVo.class);
 
         //库存处理

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java

@@ -693,13 +693,21 @@ public class DeductionServiceImpl implements DeductionService {
         synchronized (getUserLock(userId)) {
             MemberUserDO user = userService.getUser(userId);
 
-            user.setCashAmount(user.getCashAmount().add(cashAmount));
+            //考虑欠款的情况下 退还都直接退到现金，不退回微信
-            user.setWxAmount(user.getWxAmount().add(wxAmount));
+            BigDecimal oldAmount  = user.getMoney();
             user.setMoney(user.getMoney().add(money));
-            userService.updateById(user);
-
-            wxNewAmount = user.getWxAmount();
             newAmount = user.getMoney();
+
+            if(oldAmount.compareTo(BigDecimal.ZERO) < 0){
+                if(newAmount.compareTo(BigDecimal.ZERO) > 0){
+                    user.setCashAmount(user.getCashAmount().add(newAmount));
+                }
+            }else {
+                user.setCashAmount(user.getCashAmount().add(cashAmount));
+            }
+
+            userService.updateById(user);
+            wxNewAmount = user.getWxAmount();
             cashNewAmount = user.getCashAmount();
             name = user.getNickname();
         }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java

@@ -456,6 +456,10 @@ public class OrderServiceImpl implements OrderService {
     @Transactional(rollbackFor = Exception.class)
     public void reduction(Long orderId, BigDecimal money) {
         DishOrderDO dishOrderDO = dishOrderMapper.selectById(orderId);
+        if(dishOrderDO.getTotalMoney().compareTo(money) < 0){
+            throw exception(ORDER_MONEY_NOT_ENOUGH);
+        }
+
         dishOrderDO.setReductionState("1");
         if (dishOrderDO.getOrderStatus().equals("1")) {
             dishOrderDO.setReductionAmount(dishOrderDO.getReductionAmount().add(money));

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storegoodstype/StoreGoodsTypeService.java

@@ -55,5 +55,7 @@ public interface StoreGoodsTypeService {
 
     List<StoreGoodsTypeDO> getAll();
 
+    List<StoreGoodsTypeDO> getAllDevice();
+
     StoreGoodsTypeDO  getByName(String name);
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storegoodstype/StoreGoodsTypeServiceImpl.java

@@ -78,6 +78,11 @@ public class StoreGoodsTypeServiceImpl implements StoreGoodsTypeService {
                 .eq(StoreGoodsTypeDO::getAppShow, "1"));
     }
 
+    @Override
+    public List<StoreGoodsTypeDO> getAllDevice() {
+        return storeGoodsTypeMapper.selectList();
+    }
+
     @Override
     public StoreGoodsTypeDO getByName(String name) {
         List<StoreGoodsTypeDO> goodsTypeDOS = storeGoodsTypeMapper.selectList(new LambdaQueryWrapper<StoreGoodsTypeDO>().eq(StoreGoodsTypeDO::getCategoryName, name));

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java

@@ -345,9 +345,11 @@ public class StoreOrderServiceImpl implements StoreOrderService {
     @Override
     public void reduction(Long orderId, BigDecimal money) {
         StoreOrderDO storeOrderDO = storeOrderMapper.selectById(orderId);
-
         Double totalPrice = storeOrderDO.getTotalPrice();
         BigDecimal total = BigDecimal.valueOf(totalPrice).setScale(2, RoundingMode.HALF_UP);
+        if(total.compareTo(money) < 0){
+            throw exception(ORDER_MONEY_NOT_ENOUGH);
+        }
         Double reductionPrice = storeOrderDO.getReductionPrice();
         BigDecimal reduction = BigDecimal.valueOf(reductionPrice).setScale(2, RoundingMode.HALF_UP);
         storeOrderDO.setReductionPrice(reduction.add(money).doubleValue());