代码优化

ruoyi-common/ruoyi-common-pay/src/main/java/org/dromara/common/pay/config/WechatPayConfiguration.java

 package org.dromara.common.pay.config;
 
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
@@ -19,9 +17,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Javen
  */
-@Getter
-@Setter
-@ToString
+@Data
 @Component
 @ConfigurationProperties(prefix = "pay.wechat.v3")
 public class WechatPayConfiguration {

ruoyi-common/ruoyi-common-pay/src/main/java/org/dromara/common/pay/domain/JsapiNotifyModel.java

 package org.dromara.common.pay.domain;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -13,9 +10,6 @@ import java.io.Serializable;
  * @date 2024-12-10
  * @desc jsapi 回调参数
  **/
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
 @Data
 @Accessors(chain = true)
 @SuppressWarnings("all")
@@ -104,9 +98,6 @@ public class JsapiNotifyModel implements Serializable {
      */
     private PromotionDetail promotion_detail;
 
-    @Builder
-    @AllArgsConstructor
-    @NoArgsConstructor
     @Data
     @Accessors(chain = true)
     public static class Payer implements Serializable {
@@ -118,9 +109,6 @@ public class JsapiNotifyModel implements Serializable {
 
     }
 
-    @Builder
-    @AllArgsConstructor
-    @NoArgsConstructor
     @Data
     @Accessors(chain = true)
     public static class Amount implements Serializable {
@@ -147,9 +135,6 @@ public class JsapiNotifyModel implements Serializable {
 
     }
 
-    @Builder
-    @AllArgsConstructor
-    @NoArgsConstructor
     @Data
     @Accessors(chain = true)
     public static class SceneInfo implements Serializable {
@@ -161,9 +146,6 @@ public class JsapiNotifyModel implements Serializable {
 
     }
 
-    @Builder
-    @AllArgsConstructor
-    @NoArgsConstructor
     @Data
     @Accessors(chain = true)
     public static class PromotionDetail implements Serializable {
@@ -227,9 +209,6 @@ public class JsapiNotifyModel implements Serializable {
          */
         private GoodsDetail goods_detail;
 
-        @Builder
-        @AllArgsConstructor
-        @NoArgsConstructor
         @Data
         @Accessors(chain = true)
         public static class GoodsDetail implements Serializable {

ruoyi-common/ruoyi-common-pay/src/main/java/org/dromara/common/pay/domain/RefundModel.java

 package org.dromara.common.pay.domain;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -14,9 +11,6 @@ import java.util.List;
  * @date 2024-12-13
  * @desc 退款退款对象
  **/
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
 @Data
 @Accessors(chain = true)
 @SuppressWarnings("all")
@@ -108,9 +102,6 @@ public class RefundModel implements Serializable {
      */
     private List<PromotionDetail> promotion_detail;
 
-    @Builder
-    @AllArgsConstructor
-    @NoArgsConstructor
     @Data
     @Accessors(chain = true)
     public static class RefundAmount implements Serializable {
@@ -165,9 +156,6 @@ public class RefundModel implements Serializable {
          */
         private Integer refund_fee;
 
-        @Builder
-        @AllArgsConstructor
-        @NoArgsConstructor
         @Data
         @Accessors(chain = true)
         public static class From implements Serializable {
@@ -186,9 +174,6 @@ public class RefundModel implements Serializable {
     }
 
 
-    @Builder
-    @AllArgsConstructor
-    @NoArgsConstructor
     @Data
     @Accessors(chain = true)
     public static class PromotionDetail implements Serializable {
@@ -230,9 +215,6 @@ public class RefundModel implements Serializable {
         private List<GoodsDetail> goods_detail;
 
 
-        @Builder
-        @AllArgsConstructor
-        @NoArgsConstructor
         @Data
         @Accessors(chain = true)
         public static class GoodsDetail implements Serializable {

ruoyi-common/ruoyi-common-pay/src/main/java/org/dromara/common/pay/service/impl/WxPayServiceImpl.java

@@ -74,7 +74,7 @@ public class WxPayServiceImpl implements IWxPayService {
         unifiedOrderModel
             .setAppid(config.getAppId())
             .setMchid(config.getMchId())
-            .setNotify_url(config.getNotify());
+            .setNotify_url(config.getDomain() + config.getNotify());
         log.info("统一下单参数 {}", JSONUtil.toJsonStr(unifiedOrderModel));
         IJPayHttpResponse response = WxPayApi.v3(
             RequestMethodEnum.POST,
@@ -95,9 +95,10 @@ public class WxPayServiceImpl implements IWxPayService {
             String prepayId = jsonObject.getStr("prepay_id");
             Map<String, String> map = WxPayKit.jsApiCreateSign(config.getAppId(), prepayId, config.getKeyPath());
             return JSONUtil.toJsonStr(map);
-        }
+        } else {
             throw new RuntimeException("下单失败！");
         }
+    }
 
     @Override
     public boolean autoUpdateOrGetCertificate(String serialNumber) throws Exception {

ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java

@@ -101,7 +101,7 @@ public class LoginHelper {
      * 获取用户id
      */
     public static String getOpenId() {
-        return Convert.toStr(getExtra(YS_USER_ID));
+        return Convert.toStr(getExtra(OPEN_ID));
     }
 
     /**

ruoyi-modules/ruoyi-job/pom.xml

@@ -81,6 +81,12 @@
             <artifactId>ruoyi-api-server</artifactId>
         </dependency>
 
+        <!-- RuoYi Api Order -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api-order</artifactId>
+        </dependency>
+
 
     </dependencies>
 

ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/PayJobExecutor.java

+package org.dromara.job.snailjob;
+
+import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
+import com.aizuda.snailjob.client.job.core.dto.JobArgs;
+import com.aizuda.snailjob.client.model.ExecuteResult;
+import lombok.AllArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.order.api.RemoteOrderService;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author hzh
+ * @date 2024-11-18
+ */
+@AllArgsConstructor
+@Component
+@JobExecutor(name = "payJobExecutor")
+public class PayJobExecutor {
+
+    @DubboReference
+    private RemoteOrderService remoteOrderService;
+
+    public ExecuteResult jobExecute(JobArgs jobArgs) throws Exception {
+        remoteOrderService.autoUpdateOrGetCertificate(null);
+        return ExecuteResult.success("注册成功");
+    }
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/JsapiPayStrategy.java

@@ -39,12 +39,16 @@ public class JsapiPayStrategy implements IPayStrategy {
 
         //获取支付金额
         int amount = new BigDecimal("100").multiply(feeAmount).intValue();
+        if (amount <= 0) {
+            throw new RuntimeException("支付金额不能小于等于0");
+        }
         UnifiedOrderModel model = new UnifiedOrderModel()
             .setDescription("测试")
             .setOut_trade_no(ot.getOrderPayNo())
             .setTime_expire(timeExpire)
             .setAttach("")
             .setAmount(new Amount().setTotal(amount))
+            .setAmount(new Amount().setTotal(1))
             .setPayer(new Payer().setOpenid(ot.getPayOpenId()));
         return wxPayService.jsapi(model);
     }