improvements

src/main/java/com/example/afrishop_v3/controllers/OrderController.java

@@ -65,17 +65,18 @@ public class OrderController extends Controller {
         this.user = user;
     }
 
-    private TbCfCartRecordR getCart(TbCfStationItem item, String itemSku, Integer itemNum, BigDecimal price, String itemSkuId, String image) {
+    private TbCfCartRecordR getCart(TbCfStationItem item, String itemSku, Integer itemNum, BigDecimal price, TbCfItemSkus itemSkuObj) {
 
         TbCfCartRecordR record = new TbCfCartRecordR();
 
+        String image = itemSkuObj.getSkuImg();
 
         record.setItemNum(itemNum);
         record.setItemId(item.getItemId());
         record.setCartRecordId(IdUtil.createIdbyUUID());
         record.setItemSku(itemSku);
-        record.setItemSkuId(itemSkuId);
-        record.setItemCount( item.getItemCount() == null ? 0 : item.getItemCount().intValue());
+        record.setItemSkuId(itemSkuObj.getId());
+        record.setItemCount( itemSkuObj.getSkuCount() == null ? 0 : itemSkuObj.getSkuCount());
         record.setTemplate(item.getExpress());
         record.setItemTitle(item.getItemName());
         record.setItemPrice(price);
@@ -132,7 +133,7 @@ public class OrderController extends Controller {
         TbCfItemSkus itemSkus = skuOptional.get();
         BigDecimal orderPrice = itemSkus.getSkuPrice().multiply(new BigDecimal(itemNum));
         Map<String, Object> map = queryUserAvailableCoupons(orderPrice);
-        list.add(getCart(item, itemSku, itemNum, itemSkus.getSkuPrice(), itemSkuId, itemSkus.getSkuImg()));
+        list.add(getCart(item, itemSku, itemNum, itemSkus.getSkuPrice(), itemSkus));
 
         //Check that one of items in the cart run out of stock
         //Check whether the inventory is greater than the purchased quantity before placing an order
@@ -266,7 +267,7 @@ public class OrderController extends Controller {
 
             TbCfItemSkus skuObj = skuOptional.get();
 //            orderPrice=skuObj.getSkuPrice().multiply(new BigDecimal(itemNum));
-            allByUserId.add(getCart(stationItem, itemSku, itemNum, skuObj.getSkuPrice(), itemSkuId, skuObj.getSkuImg()));
+            allByUserId.add(getCart(stationItem, itemSku, itemNum, skuObj.getSkuPrice(), skuObj));
 
         } else {
             //System.out.println(Arrays.toString(tbCfOrder.getIds()));

src/main/java/com/example/afrishop_v3/models/TbCfCartRecordR.java

@@ -96,7 +96,7 @@ public class TbCfCartRecordR {
     private BigDecimal realItemPrice;
 
     @JsonIgnore
-    @Formula(value = "(SELECT st.item_count FROM tb_cf_station_item st WHERE st.item_id=item_id limit 1)")
+    @Formula(value = "(SELECT st.item_count FROM tb_cf_item_skus st WHERE st.id=item_sku_id limit 1)")
     private Integer itemCount;
 
     @Formula(value = "(SELECT sk.sku_price FROM tb_cf_item_skus sk WHERE sk.id=item_sku_id limit 1)")