update bonus

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

@@ -262,7 +262,7 @@ public class BonusController extends Controller {
 
     private TbCfUserInfo runBonusInc(TbCfUserInfo user, BigDecimal amount, int percent,boolean direct,String orderId) {
         if (user == null) return null;
-        Optional<Network> userCode = networkRepository.findByNetworkInfoCode(user.getCode());
+        Optional<Network> userCode = networkRepository.findFirstByNetworkInfoCode(user.getCode());
         if (userCode.isPresent() || direct) {
             TbCfUserInfo userInfo = direct ? user : userCode.get().getUserInfo();
             Bonus bonus = new Bonus();

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

@@ -434,7 +434,7 @@ public class DpoPayController extends Controller {
 
     private TbCfUserInfo runBonusInc(TbCfUserInfo user, BigDecimal amount, int percent, boolean direct, String orderId) {
         if (user == null) return null;
-        Optional<Network> userCode = networkRepository.findByNetworkInfoCode(user.getCode());
+        Optional<Network> userCode = networkRepository.findFirstByNetworkInfoCode(user.getCode());
         if (userCode.isPresent() || direct) {
             TbCfUserInfo userInfo = direct ? user : userCode.get().getUserInfo();
             Bonus bonus = new Bonus();

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

@@ -431,7 +431,7 @@ public class FlutterWaveController extends Controller {
 
     private TbCfUserInfo runBonusInc(TbCfUserInfo user, BigDecimal amount, int percent, boolean direct, String orderId) {
         if (user == null) return null;
-        Optional<Network> userCode = networkRepository.findByNetworkInfoCode(user.getCode());
+        Optional<Network> userCode = networkRepository.findFirstByNetworkInfoCode(user.getCode());
         if (userCode.isPresent() || direct) {
             TbCfUserInfo userInfo = direct ? user : userCode.get().getUserInfo();
             Bonus bonus = new Bonus();

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

@@ -359,7 +359,7 @@ public class PaypalContoller extends Controller {
 
     private TbCfUserInfo runBonusInc(TbCfUserInfo user, BigDecimal amount, int percent, boolean direct, String orderId) {
         if (user == null) return null;
-        Optional<Network> userCode = networkRepository.findByNetworkInfoCode(user.getCode());
+        Optional<Network> userCode = networkRepository.findFirstByNetworkInfoCode(user.getCode());
         if (userCode.isPresent() || direct) {
             TbCfUserInfo userInfo = direct ? user : userCode.get().getUserInfo();
             Bonus bonus = new Bonus();

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

@@ -98,7 +98,7 @@ public class TbCfCartRecordR {
     private BigDecimal skuPrice;
 
 
-    public TbCfCartRecordR(){
+    public TbCfCartRecordR() {
         this.shopName = "afrishop";
     }
 
@@ -114,11 +114,17 @@ public class TbCfCartRecordR {
         this.itemImg = itemImg;
     }
 
+    public BigDecimal getOriginalPrice() {
+        return itemPrice;
+    }
+
     //get update item price instead of static one
     public BigDecimal getItemPrice() {
-        return skuPrice != null ? skuPrice : realItemPrice !=null ? realItemPrice : itemPrice;
+        return skuPrice != null ? skuPrice : realItemPrice != null ? realItemPrice : itemPrice;
     }
 
+
+
     public BigDecimal getItemPriceTotal() {
         return itemPrice.multiply(BigDecimal.valueOf(itemNum));
     }
@@ -149,18 +155,21 @@ public class TbCfCartRecordR {
     public String getItemImg() {
         return itemImg;
     }
+
     /**
      * 设置：商品分类
      */
     public void setItemCategory(String itemCategory) {
         this.itemCategory = itemCategory;
     }
+
     /**
      * 获取：商品分类
      */
     public String getItemCategory() {
         return itemCategory;
     }
+
     /**
      * 设置：状态 0：已删除 1：加入购物车 2：直接支付（预留）
      */
@@ -169,7 +178,6 @@ public class TbCfCartRecordR {
     }
 
 
-
     /**
      * 获取：状态 0：已删除 1：加入购物车 2：直接支付（预留）
      */
@@ -221,9 +229,9 @@ public class TbCfCartRecordR {
         return itemId;
     }
 
-    TbCfItemOrderR getOrderItem(String orderId){
-        if( template == null ) System.out.println("Template is null");
-        return new TbCfItemOrderR(cartRecordId,orderId,itemId,itemNum,getItemPrice(),template,itemImg,itemSku,itemTitle,shopId,shopName,shopUrl,itemSkuId);
+    TbCfItemOrderR getOrderItem(String orderId) {
+        if (template == null) System.out.println("Template is null");
+        return new TbCfItemOrderR(cartRecordId, orderId, itemId, itemNum, getItemPrice(), template, itemImg, itemSku, itemTitle, shopId, shopName, shopUrl, itemSkuId);
     }
 
     public void setTemplate(TbCfExpressTemplate template) {

src/main/java/com/example/afrishop_v3/repository/NetworkRepository.java

@@ -12,7 +12,7 @@ public interface NetworkRepository extends PagingAndSortingRepository<Network,St
     boolean existsByUserInfo_CodeAndNetworkInfo_UserId(String userInfo_code, String networkInfo_userId);
     Network findByUserInfo_UserIdAndNetworkInfo_UserId(String user, String network);
     Network findByUserInfo_CodeAndNetworkInfo_UserId(String userInfo_code, String networkInfo_userId);
-    Optional<Network> findByNetworkInfoCode(String user_code);
+    Optional<Network> findFirstByNetworkInfoCode(String user_code);
 
     Network findTopByOrderByIdDesc();