Browse Source

代码提交

pangqijun 1 month ago
parent
commit
af123ce009

+ 5 - 1
pom.xml

@@ -317,7 +317,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-quartz</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.baidu.aip</groupId>
+            <artifactId>java-sdk</artifactId>
+            <version>4.16.19</version>
+        </dependency>
     </dependencies>
 
     <build>

+ 1 - 0
src/main/java/org/springblade/modules/api/service/impl/VendingOrderServiceImpl.java

@@ -7,6 +7,7 @@ import org.springblade.modules.api.service.VendingOrderService;
 import org.springblade.modules.finance.vo.OrderGoodsVO;
 import org.springblade.modules.finance.vo.OrderVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

+ 3 - 1
src/main/java/org/springblade/modules/finance/mapper/OrderGoodsMapper.xml

@@ -79,7 +79,9 @@
             og.*,
             o.order_no,
             o.order_state,
-            o.is_aftersales
+            o.is_aftersales,
+            o.total_amount,
+            o.payment_amount
         FROM
             t_order o
             JOIN t_order_goods og ON o.id = og.order_id