dcs 2 mēneši atpakaļ
vecāks
revīzija
b2854e8b77

+ 3 - 1
virgo.api/src/main/java/com/bosshand/virgo/api/workark/service/OrderInfoService.java

@@ -15,6 +15,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.Duration;
@@ -59,6 +60,7 @@ public class OrderInfoService {
         return orderInfoDao.get(id);
     }
 
+    @Transactional
     public OrderInfo createOrderByProductId(Long productId, List<ProductCoupon> productCouponList) {
 
         long userId = ContextUtils.getUserContext().getUserId();
@@ -215,7 +217,7 @@ public class OrderInfoService {
         if (productCoupon.getType() == 1) {
             // 门槛
             BigDecimal threshold = productCoupon.getThreshold();
-            if (price.compareTo(threshold) > 0) {
+            if (price.compareTo(threshold) >= 0) {
                 // 优惠金额
                 return productCoupon.getCouponAmount();
             }

+ 19 - 1
virgo.api/src/main/resources/application.properties

@@ -69,4 +69,22 @@ spring.quartz.properties.org.quartz.jobStore.useProperties=false
 spring.quartz.properties.org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
 spring.quartz.properties.org.quartz.threadPool.threadCount=10
 spring.quartz.properties.org.quartz.threadPool.threadPriority=5
-spring.quartz.properties.org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true
+spring.quartz.properties.org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true
+
+# \u5FAE\u4FE1\u652F\u4ED8\u76F8\u5173\u53C2\u6570
+# \u5546\u6237\u53F7
+wxpay.mch-id=1713342191
+# \u5546\u6237API\u8BC1\u4E66\u5E8F\u5217\u53F7
+wxpay.mch-serial-no=64DD441CA7AED779EA89D106B59F78C730D4EA52
+# \u5546\u6237\u79C1\u94A5\u6587\u4EF6
+wxpay.private-key-path=apiclient_key.pem
+# APIv3\u5BC6\u94A5
+wxpay.api-v3-key=jnjdmPtU7xmz9gJhjrGo0K1jYllsEehe
+# APPID
+wxpay.appid=wx3c006d364161d240
+# \u5FAE\u4FE1\u670D\u52A1\u5668\u5730\u5740
+wxpay.domain=https://api.mch.weixin.qq.com
+# \u63A5\u6536\u7ED3\u679C\u901A\u77E5\u5730\u5740
+wxpay.notify-domain=https://www.waywish.com
+# APIv2\u5BC6\u94A5
+wxpay.partnerKey=mabrdt9WNgXmIj5rFzFxeN9JShX5irBr