订单编号改成8位

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppOrderController.java

@@ -266,7 +266,7 @@ public class AppOrderController {
 
 
         @ApiOperation("待处理红点数")
-        @PostMapping("/pendingRedDots")
+        @GetMapping("/pendingRedDots")
         public Result pendingRedDots() {
             Map<Integer, Integer> integerIntegerMap = storeOrderService.pendingRedDots();
             return Result.success(integerIntegerMap);

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppUserAddressController.java

@@ -39,7 +39,7 @@ public class AppUserAddressController {
 
     @PostMapping("/add")
     @ApiOperation(value = "收获地址新增")
-    public Result<Long> add(@RequestBody UserAddress userAddress) {
+    public Result<Long> addUserAddress(@RequestBody UserAddress userAddress) {
         Long tokenUserId = AuthService.getTokenUserId(null);
         userAddress.setUid(tokenUserId);
         if (userAddress == null) {
@@ -48,10 +48,9 @@ public class AppUserAddressController {
         try {
             userAddress.setCreateTime(new Date());
             userAddress.setCreateUserId(userAddress.getUid());
-            userAddressService.save(userAddress);
-            if (userAddress.getIsDefault() == 1) {
-                checkOnlyAddress(userAddress, userAddress.getId());
-            }
+            userAddress.setUid(userAddress.getUid());
+            userAddressService.addUserAddress(userAddress);
+
         } catch (Exception e) {
             log.error("新增对象操作异常e:{}", e);
             return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
@@ -79,7 +78,7 @@ public class AppUserAddressController {
 
     @PutMapping("/update")
     @ApiOperation(value = "收获地址更新")
-    public Result update(@RequestBody UserAddress userAddress) {
+    public Result updateAddress(@RequestBody UserAddress userAddress) {
         Long tokenUserId = AuthService.getTokenUserId(null);
         userAddress.setUid(tokenUserId);
         if (userAddress == null) {
@@ -90,11 +89,9 @@ public class AppUserAddressController {
         }
         try {
             userAddress.setUpdateTime(new Date());
-//    		userAddress.setUpdateUserId(userId);
-            userAddressService.update(userAddress);
-            if (userAddress.getIsDefault() == 1) {
-                checkOnlyAddress(userAddress, userAddress.getId());
-            }
+     		userAddress.setUpdateUserId(tokenUserId);
+            userAddressService.updateAddress(userAddress);
+
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
             return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
@@ -151,18 +148,10 @@ public class AppUserAddressController {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
         try {
-            UserAddress userAddress = new UserAddress();
-            userAddress.setUpdateTime(new Date());
-//    		userAddress.setUpdateUserId(userId);
-            userAddress.setId(id);
-            userAddress.setIsDefault(1);
-            userAddressService.update(userAddress);
 
-            UserAddress address = userAddressService.findById(id);
-            if (address == null) {
-                return Result.fail(ResultCode.OBJECT_IS_NULL);
-            }
-            checkOnlyAddress(address, id);
+            userAddressService.defaultAddress(id);
+
+
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
             return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
@@ -180,17 +169,5 @@ public class AppUserAddressController {
         return Result.success(userAddress);
     }
 
-    private void checkOnlyAddress(UserAddress userAddress, Long defaultId) {
-        Condition condition = new Condition(UserAddress.class);
-        Example.Criteria criteria = condition.createCriteria();
-        criteria.andEqualTo("isDelete", 0);
-        criteria.andEqualTo("uid", userAddress.getUid());
-        criteria.andNotEqualTo("id", defaultId);
-        criteria.andEqualTo("isDefault", 1);
-        List<UserAddress> list = userAddressService.findByCondition(condition);
-        for (UserAddress ua : list) {
-            ua.setIsDefault(0);
-            userAddressService.update(ua);
-        }
-    }
+
 }

mall-service/src/main/java/com/txz/mall/service/UserAddressService.java

@@ -1,7 +1,9 @@
 package com.txz.mall.service;
 
+import com.txz.mall.core.Result;
 import com.txz.mall.core.Service;
 import com.txz.mall.model.UserAddress;
+import org.springframework.web.bind.annotation.RequestBody;
 
 
 /**
@@ -15,4 +17,13 @@ public interface UserAddressService extends Service<UserAddress> {
      * @return UserAddress
      */
     UserAddress getDefaultByUid(Long uid);
+
+
+    void defaultAddress(Long id);
+
+
+    void updateAddress(UserAddress userAddress);
+
+
+    void addUserAddress(UserAddress userAddress);
 }

mall-service/src/main/java/com/txz/mall/service/impl/StoreOrderServiceImpl.java

@@ -1473,7 +1473,8 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         preOrderResponse.setYuePayStatus(1);
         return preOrderResponse;
     }
-
+    @Resource
+    private CreateSequenceService createSequenceService;
     @Override
     public MyRecord createOrder(CreateOrderRequest request) {
         UserDTO user = userDubboServiceClient.getUser(request.getUserId());
@@ -1526,8 +1527,12 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         //        orderComputedPriceRequest.setUseIntegral(request.getUseIntegral());
         ComputedOrderPriceResponse computedOrderPriceResponse = computedPrice(orderComputedPriceRequest, orderInfoVo, user);
 
+        CreateSequence createSequence = new CreateSequence();
+        createSequenceService.save(createSequence);
+        Long id = createSequence.getId();
+        String orderNo = "DD" + id;
         // 生成订单号
-        String orderNo = OrderUtils.getOrderCode();
+       // String orderNo = OrderUtils.getOrderCode();
 
         // 购买赠送的积分
         List<StoreOrderInfo> storeOrderInfos = new ArrayList<>();
@@ -2400,7 +2405,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         //待支付数量
         Condition conditionStoreStorePinkToPay = new Condition(StorePink.class);
         Example.Criteria criteriaStorePinkToPay = conditionStoreStorePinkToPay.createCriteria();
-        criteriaStorePinkToPay.andEqualTo("orderStatus", PinkOrderStatusEnum.GROUP_ORDER_TO_PAY);
+        criteriaStorePinkToPay.andEqualTo("orderStatus", PinkOrderStatusEnum.GROUP_ORDER_TO_PAY.getKey());
         criteriaStorePinkToPay.andEqualTo("isDelete", 0);
         criteriaStorePinkToPay.andEqualTo("uid", tokenUserId);
         int i = storePinkMapper.selectCountByCondition(conditionStoreStorePinkToPay);
@@ -2409,11 +2414,22 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         //中奖未填写收获地址数量
         Condition conditionStoreStorePinkPaid = new Condition(StorePink.class);
         Example.Criteria criteriaStorePinkPaid = conditionStoreStorePinkPaid.createCriteria();
-        criteriaStorePinkPaid.andEqualTo("orderStatus", PinkOrderStatusEnum.GROUP_ORDER_PAID);
+        criteriaStorePinkPaid.andEqualTo("orderStatus", PinkOrderStatusEnum.GROUP_ORDER_PAID.getKey());
         criteriaStorePinkPaid.andEqualTo("isDelete", 0);
-        criteriaStorePinkToPay.andEqualTo("uid", tokenUserId);
-        int ii = storeOrderMapper.selectCountByCondition(conditionStoreStorePinkPaid);
+        criteriaStorePinkPaid.andEqualTo("uid", tokenUserId);
+        int ii = storePinkMapper.selectCountByCondition(conditionStoreStorePinkPaid);
+        resultMap.put(2,ii);
 
+        //中奖未填写收获地址数量
+        Condition conditionStoreStorePinkToShip = new Condition(StorePink.class);
+        Example.Criteria criteriaStorePinkToShip = conditionStoreStorePinkToShip.createCriteria();
+
+        ArrayList<Integer> integers = CollUtil.newArrayList(PinkOrderStatusEnum.GROUP_ORDER_TO_SHIP.getKey(), PinkOrderStatusEnum.GROUP_ORDER_TO_RECEIVE.getKey());
+        criteriaStorePinkToShip.andIn("orderStatus", integers);
+        criteriaStorePinkToShip.andEqualTo("isDelete", 0);
+        criteriaStorePinkToShip.andEqualTo("uid", tokenUserId);
+        int iii = storePinkMapper.selectCountByCondition(conditionStoreStorePinkToShip);
+        resultMap.put(4,iii);
 
 
 

mall-service/src/main/java/com/txz/mall/service/impl/UserAddressServiceImpl.java

@@ -2,15 +2,20 @@ package com.txz.mall.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.txz.mall.core.AbstractService;
+import com.txz.mall.core.Result;
+import com.txz.mall.core.ResultCode;
+import com.txz.mall.core.ServiceException;
 import com.txz.mall.dao.UserAddressMapper;
 import com.txz.mall.model.UserAddress;
 import com.txz.mall.service.UserAddressService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import tk.mybatis.mapper.entity.Condition;
 import tk.mybatis.mapper.entity.Example;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 
@@ -35,4 +40,57 @@ public class UserAddressServiceImpl extends AbstractService<UserAddress> impleme
         }
         return null;
     }
+
+    @Override
+    public void defaultAddress(Long id) {
+
+        UserAddress userAddress = new UserAddress();
+        userAddress.setUpdateTime(new Date());
+//    		userAddress.setUpdateUserId(userId);
+        userAddress.setId(id);
+        userAddress.setIsDefault(1);
+        update(userAddress);
+        UserAddress address = findById(id);
+        if (address == null) {
+            throw new ServiceException(ResultCode.OBJECT_IS_NULL);
+        }
+        checkOnlyAddress(address, id);
+
+
+    }
+
+    @Override
+    public void updateAddress(UserAddress userAddress) {
+
+        update(userAddress);
+        if (userAddress.getIsDefault() == 1) {
+            checkOnlyAddress(userAddress, userAddress.getId());
+        }
+    }
+
+    @Override
+    public void addUserAddress(UserAddress userAddress) {
+        save(userAddress);
+        if (userAddress.getIsDefault() == 1) {
+            checkOnlyAddress(userAddress, userAddress.getId());
+        }
+    }
+
+    private void checkOnlyAddress(UserAddress userAddress, Long defaultId) {
+        Condition condition = new Condition(UserAddress.class);
+        Example.Criteria criteria = condition.createCriteria();
+        criteria.andEqualTo("isDelete", 0);
+        criteria.andEqualTo("uid", userAddress.getUid());
+        criteria.andNotEqualTo("id", defaultId);
+        criteria.andEqualTo("isDefault", 1);
+        List<UserAddress> list = findByCondition(condition);
+        if (!CollectionUtils.isEmpty(list)) {
+            for (UserAddress ua : list) {
+                ua.setIsDefault(0);
+                update(ua);
+            }
+        }
+    }
+
+
 }

mall-service/src/main/java/com/txz/mall/util/OrderUtils.java

@@ -121,7 +121,11 @@ public class OrderUtils {
      */
 
     public static String getOrderCode() {
-        return ORDER_CODE + getCode();
+
+
+        String code = getCode()+"";
+
+        return ORDER_CODE + code;
     }
 
     /**
@@ -177,8 +181,10 @@ public class OrderUtils {
     }
 
     public static void main(String[] args) {
-        String withdrawalCode = getWithdrawalCode();
-        System.out.println(withdrawalCode);
-        System.out.println(withdrawalCode.length());
+        String orderCode = getOrderCode();
+        System.out.println(orderCode);
+//        String withdrawalCode = getWithdrawalCode();
+//        System.out.println(withdrawalCode);
+//        System.out.println(withdrawalCode.length());
     }
 }

mall-service/src/main/java/com/txz/mall/web/mng/CreateSequenceController.java

@@ -1,130 +0,0 @@
-package com.txz.mall.web.mng;
-import com.txz.mall.core.Result;
-import com.txz.mall.model.CreateSequence;
-import com.txz.mall.service.CreateSequenceService;
-
-import com.txz.mall.core.ResultCode;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import tk.mybatis.mapper.entity.Condition;
-import tk.mybatis.mapper.entity.Example.Criteria;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Date;
-
-/**
-* Created by CodeGenerator on 2025/09/10.
-*/
-@Api(tags = "[后台]createSequence管理")
-@RestController
-@RequestMapping("/create/sequence")
-public class CreateSequenceController {
-
-	private static Logger log = LoggerFactory.getLogger(CreateSequenceController.class);
-
-    @Resource
-    private CreateSequenceService createSequenceService;
-
-    @PostMapping("/add")
-	@ApiOperation(value = "createSequence新增")
-	public Result add(@RequestBody CreateSequence createSequence) {
-    	if(createSequence == null){
-    		return Result.fail(ResultCode.OBJECT_IS_NULL);
-    	}
-    	try {
-    		createSequence.setCreateTime(new Date());
-//            createSequence.setCreateUserId(userId);
-    		createSequenceService.save(createSequence);
-		} catch (Exception e) {
-			log.error("新增对象操作异常e:{}",e);
-			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return Result.success();
-    }
-
-    @DeleteMapping("/delete")
-	@ApiOperation(value = "createSequence删除")
-	public Result delete(@RequestParam Long id) {
-    	if(id == null){
-    		return Result.fail(ResultCode.ID_IS_NULL);
-    	}
-    	try {
-            CreateSequence createSequence = new CreateSequence();
-			createSequence.setId(id);
-			createSequence.setIsDelete(1);
-			createSequenceService.update(createSequence);
-		} catch (Exception e) {
-			log.error("删除对象操作异常e:{}",e);
-			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return Result.success();
-    }
-
-    @PutMapping("/update")
-	@ApiOperation(value = "createSequence更新")
-	public Result update(@RequestBody CreateSequence createSequence) {
-    	if(createSequence == null){
-    		return Result.fail(ResultCode.OBJECT_IS_NULL);
-    	}
-    	if(createSequence.getId() == null){
-    		return Result.fail(ResultCode.ID_IS_NULL);
-    	}
-    	try {
-    		createSequence.setUpdateTime(new Date());
-//            createSequence.setUpdateUserId(userId);
-    		createSequenceService.update(createSequence);
-		} catch (Exception e) {
-			log.error("更新对象操作异常e:{}",e);
-			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return Result.success();
-    }
-
-    @GetMapping("/detail")
-	@ApiOperation(value = "createSequence获取详情")
-	public Result<CreateSequence> detail(@RequestParam Long id) {
-    	if(id == null){
-    		return Result.fail(ResultCode.ID_IS_NULL);
-    	}
-    	CreateSequence createSequence = null;
-    	try {
-    		createSequence = createSequenceService.findById(id);
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return Result.success(createSequence);
-    }
-
-    @PostMapping("/list")
-	@ApiOperation(value = "createSequence获取列表")
-	public Result<List<CreateSequence>> list(@Validated @RequestBody CreateSequenceDTO dto) {
-        PageHelper.startPage(dto.getPage(), dto.getSize());
-
-        Condition condition = new Condition(CreateSequence.class);
-        Criteria criteria = condition.createCriteria();
-		criteria.andEqualTo("isDelete", 0);
-		condition.setOrderByClause("create_time DESC");
-		PageInfo pageInfo = null;
-		try {
-    		 List<CreateSequence> list = createSequenceService.findByCondition(condition);
-    		 pageInfo = new PageInfo(list);
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return Result.success(pageInfo);
-    }
-}