zhijiezhao 3 years ago
parent
commit
ce5fda3037

+ 36 - 1
pom.xml

@@ -124,7 +124,42 @@
             <version>1.2.75</version>
         </dependency>
 
-
+        <!--freemarker 模板引擎-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.8.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcmail-jdk15</artifactId>
+            <version>1.46</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
+        </dependency>
 
 
 

+ 1 - 1
src/main/java/com/caimei365/order/mapper/PayOrderMapper.java

@@ -243,5 +243,5 @@ public interface PayOrderMapper {
 
     void insertAuthVipRoleRelation(Integer userId, Integer roleId);
 
-    void updateSplitAccount(String rt9_serialNumber, String orderId);
+    void updateSplitAccount(String mbOrderId, String orderRequestNo);
 }

+ 0 - 1
src/main/java/com/caimei365/order/service/impl/HeliPayServiceImpl.java

@@ -763,7 +763,6 @@ public class HeliPayServiceImpl implements HeliPayService {
                     SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     String currentTime = format.format(new Date());
                     // 保存付款单表
-                    //todo 线上余额分账保存balancePayFee
                     PayShopPo payShop = new PayShopPo();
                     payShop.setShopId(shopId);
                     payShop.setName("线上支付分账");