修复微信支付代码编写

forest-common/src/main/java/com/hwrj/cloud/common/api/CommonPage.java

@@ -3,6 +3,7 @@ package com.hwrj.cloud.common.api;
 import com.github.pagehelper.PageInfo;
 import org.springframework.data.domain.Page;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -14,7 +15,7 @@ public class CommonPage<T> {
     private Integer pageSize;
     private Integer totalPage;
     private Long total;
-    private List<T> list;
+    private List<T> list=new ArrayList<>();
 
     /**
      * 将PageHelper分页后的list转为分页信息

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -476,6 +476,10 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             //加锁 操作很类似Java的ReentrantLock机制
             lock.lock();
             PmsProduct pmsProduct = pmsProductMapper.selectByPrimaryKey(orderFrom.getProductId());
+            BigDecimal price = pmsProduct.getPrice();
+            if(StringUtils.isEmpty(price)){
+                throw new RuntimeException("暂无价格无法下单！");
+            }
             //新增购物车
             OmsCartItem cartItem = new OmsCartItem();
             //构建订单数据
@@ -483,8 +487,12 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             //下单
             return saveOrder(orderParam, orderFrom);
         } catch (Exception e) {
+            if(e instanceof RuntimeException){
+                Asserts.fail(e.getMessage());
+            }else {
+                Asserts.fail(e.getMessage());
+            }
             System.out.println(e.getMessage());
-            Asserts.fail("卖完了!");
         } finally {
             //解锁
             lock.unlock();