quota 初始化取商品库存

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

@@ -65,9 +65,9 @@ public class StoreCombinationServiceImpl extends AbstractService<StoreCombinatio
             storeCombination.setInfo(storeProduct.getStoreInfo());
             storeCombination.setStock(storeProduct.getStock());
             storeCombination.setCateId(storeProduct.getCateId());
-            storeCombination.setOnceNum(10);
-            storeCombination.setQuota(10);
-            storeCombination.setNum(10);
+            storeCombination.setOnceNum(storeProduct.getStock());
+            storeCombination.setQuota(storeProduct.getStock());
+            storeCombination.setNum(storeProduct.getStock());
             storeCombination.setCost(storeProduct.getCost());
             storeCombination.setStartTime(flashActivity.getStartTime());
             storeCombination.setStopTime(flashActivity.getEndTime());

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

@@ -56,9 +56,13 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.txz.mall.util.OrderUtils.getDateTime;
+
 
 /**
  * Created by CodeGenerator on 2025/07/15.
@@ -1550,10 +1554,12 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
 
         CreateSequence createSequence = new CreateSequence();
         createSequenceService.save(createSequence);
+
+
         Long id = createSequence.getId();
-        String orderNo = "DD" + id;
+
         // 生成订单号
-        // String orderNo = OrderUtils.getOrderCode();
+         String orderNo = OrderUtils.getOrderCode()+ id;
 
         // 购买赠送的积分
         List<StoreOrderInfo> storeOrderInfos = new ArrayList<>();

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

@@ -13,7 +13,7 @@ public class OrderUtils {
     /**
      * 订单类别头
      */
-    private static final String ORDER_CODE = "DD";
+    private static final String ORDER_CODE = "BH";
 
     /**
      * 团购类别头
@@ -73,7 +73,7 @@ public class OrderUtils {
     /**
      * 生成时间戳
      */
-    private static String getDateTime() {
+    public static String getDateTime() {
         DateFormat sdf = new SimpleDateFormat("yyMMddHHmmss");
         return sdf.format(new Date());
     }
@@ -122,10 +122,11 @@ public class OrderUtils {
 
     public static String getOrderCode() {
 
+        DateFormat sdf = new SimpleDateFormat("yyMMdd");
+        String format = sdf.format(new Date());
+      //  String code = getCode()+"";
 
-        String code = getCode()+"";
-
-        return ORDER_CODE + code;
+        return ORDER_CODE + format;
     }
 
     /**

mall-service/src/test/java/CodeGenerator.java

@@ -47,7 +47,7 @@ public class CodeGenerator {
 	public static void main(String[] args) {
 //		genCode("o_lottery","o_lottery_prize","o_lottery_record");
 		// genCode("输入表名","输入自定义Model名称");
-		genCode("m_mid_favorite");
+		genCode("m_create_sequence");
 		//genCode("c_member_coupon");
 	}