diff --git a/client-api/src/main/java/org/jiayunet/controller/MemberProductController.java b/client-api/src/main/java/org/jiayunet/controller/MemberProductController.java index 6d88e0e..0d7a567 100644 --- a/client-api/src/main/java/org/jiayunet/controller/MemberProductController.java +++ b/client-api/src/main/java/org/jiayunet/controller/MemberProductController.java @@ -16,8 +16,8 @@ import java.util.List; * * @author zk */ -//@RestController -//@RequestMapping("/member/product") +@RestController +@RequestMapping("/member/product") @AllArgsConstructor public class MemberProductController { diff --git a/client-api/src/main/java/org/jiayunet/service/AlipayNotifyMessageAbstractImpl.java b/client-api/src/main/java/org/jiayunet/service/AlipayNotifyMessageAbstractImpl.java index 095d9bb..1cbafcf 100644 --- a/client-api/src/main/java/org/jiayunet/service/AlipayNotifyMessageAbstractImpl.java +++ b/client-api/src/main/java/org/jiayunet/service/AlipayNotifyMessageAbstractImpl.java @@ -21,7 +21,7 @@ import java.util.Map; * * @author zk */ -//@Service +@Service @Primary @Slf4j @AllArgsConstructor diff --git a/client-api/src/main/java/org/jiayunet/service/MemberProductService.java b/client-api/src/main/java/org/jiayunet/service/MemberProductService.java index fdb01f3..e006e83 100644 --- a/client-api/src/main/java/org/jiayunet/service/MemberProductService.java +++ b/client-api/src/main/java/org/jiayunet/service/MemberProductService.java @@ -29,7 +29,7 @@ import java.util.List; * * @author zk */ -//@Service +@Service @Slf4j public class MemberProductService { @@ -51,7 +51,7 @@ public class MemberProductService { //@Autowired private WxNativePayAbility wxNativePayAbility; - //@Autowired + @Autowired private AlipayPagePayAbility alipayPagePayAbility; @Autowired @@ -90,16 +90,11 @@ public class MemberProductService { order.setPayAmount(product.getPrice()); order.setPayChannel(payChannel); order.setStatus(0); - memberOrderMapper.insert(order); - - // 3. 生成orderNo String orderNo = "OP" + order.getId(); order.setOrderNo(orderNo); - memberOrderMapper.update(null, new LambdaUpdateWrapper() - .eq(MemberOrder::getId, order.getId()) - .set(MemberOrder::getOrderNo, orderNo)); + memberOrderMapper.insert(order); - // 4. 调支付渠道下单 + // 3. 调支付渠道下单 String payData; if (payChannel == 1) { payData = prepayWechat(orderNo, product); @@ -107,7 +102,7 @@ public class MemberProductService { payData = prepayAlipay(orderNo, product); } - // 5. 返回 + CreateOrderDto dto = new CreateOrderDto(); dto.setOrderId(order.getId()); dto.setPayChannel(payChannel); diff --git a/client-api/src/main/resources/application-local.yml b/client-api/src/main/resources/application-local.yml index 0e92077..4b726f5 100644 --- a/client-api/src/main/resources/application-local.yml +++ b/client-api/src/main/resources/application-local.yml @@ -36,10 +36,10 @@ wx_pay: # 支付宝支付 alipay: # status close:关闭 open:打开 - status: close - app_id: ${ALIPAY_APP_ID:your_app_id} - private_key: ${ALIPAY_PRIVATE_KEY:your_private_key} - alipay_public_key: ${ALIPAY_PUBLIC_KEY:your_alipay_public_key} + status: open + app_id: ${ALIPAY_APP_ID:2021006154620509} + private_key: ${ALIPAY_PRIVATE_KEY:MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDWAKDY6yFNVjWH1uXBt+wEqU4QTVAMqwWgMRlniK+kZn4bqL4bwP3sGOB+y4PpJKpFWTiCyl1ChpX311F1tQFhqwJfGedQh2e+OSUaJQmQKJ6JgC/LV8aZPsGSUD/1DwcQUR/fHM3eQ/XFTAb5+o8U7tAkl69FBURP8yuUStUZ3uiz/xFUBbH3RVukrFFbFTany7o1UikqgjY8qj+dWDlqlHr7W1RGVSErtrXnzVVniPb5adol/1Qdw8cy8J1bsiKeRhBjPRDpQX3gb0AR6ThDsP4nZHE02Kw0ApcNGD1/kOSEHgXZiB3KXaIEZnzCf91F3ben8n7Okb49k4bkD6//AgMBAAECggEABUKwsYReJjOHT1aGAVQPFjI/PAFahWUy1zQ9xqDCiI0Ibo+gVLhSxZn68sL39CQ1l0zRKc3lqvv59cSyOO2BIjB892+Akycw8qke81yTtpp5AzJGen4m4J99TKZyXAjJiKol2Wsw2FTdVsM+rKhvGfmg3jVoVo8BleGJYbTRNjiMASdxOzMdlk1j3mKy9OY3AlfC0ERyWloua52bA0LsKTp96iju8uz7sr+1lgQmSC7UJHnVWwKGbsjtcltigCUhuknxqvw7bkBHaEUhuKrOpcKqWW1RRCYhxW1SfKaj2TXIUFaF2rGiJL6wAXkaHp5VZ5kgYksMzCcbofOTjr+XqQKBgQD6h9koWwKWD/ndrMJ3KXsjOQJd8i6bT3QdD5yqOOJjGTS+eAvjpDgsvimRSa9eoyORU0dRUWtgVkTExrZAxoElwZZoiv5XfayKlp56rNLrb6oP58vQfepdexe3KQRjHrRCbKK6YX74Gg+hsL6w6BCagpD2xXBXWk9Ibf0izkLb7QKBgQDarKIdT2cYgAI1YiHkbXuUiTOlCZKw2OeFG0BViGI5c8DOXaxiMe9oeRY6HSBM15s3CmjMZBcjuFe49lhq9Yw4i2Cve8bXiS9Nx0RMVtw/tSY3ztMnjY06Sxj4r0zSTEM0RHp4PxHBCkXvxl6ay5WNxzAnJ5Bw/wA62MVYwEi2GwKBgD/KPUngOn1ZHgcKiQ1sW3Uxe9/N3X4gMfGAWySgjUwsS9i/mk9hLgh+dvkOaP/QzCqhqMQU1iFWdfYgnqFJqfKiIxkFYxOF5Vv4U+vqe14FNakNHUE9/mHFCNnTMNHILJ/JJ3oLfxfPEvHZngRPYoLlAeJDjYJAdXV8w/qLyExVAoGACy2D4+epJ3Fzq3LmtJx8Eq2ovCjvHKcZvo4UDcs46iLmmiXjp+lRiY+W+UV/3y2uO3QGw1viausDYOsGvgDrOAC34oB7O41Bo8Ip1ZUjEQabe4LQ/FaZ/37TOfMMBDvtu4A8mmTu7WUvCgCj2VnKvUKPTZESKxR92IQ4Ij9B+D0CgYBm/JdpxhouDoAt+sNw2pkRu8i7qFQqmiWgE7NLiAOTeIU5n/pGVdkLRV/+B9nEN0vHF8RepToY9kOqWM1jW79yE0whbrexOpJe9gyPQICttN4NlQ46uPnCAtX9Uk07l6UcJ/a4igKFJc4YOkHP3O4Ukb4q7X9ifBuN5m6XkF1JTw==} + alipay_public_key: ${ALIPAY_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmqQrNof4mHkyHPDbe/CX84xQFobRBGS6L886Z2oWQ2wK4BDMXFna0aH0HhYDb5ZmiMZ+S8UfXwAeiH5XpFSYWCh8iG+Hp0Zjl/NVIBcd4RzCLUI/7Q2jwKFtaYHTcM6yNZxAdX566RDj637ed03FPCGchiQGMZJXJNMdY9L0nyPeNutJ9tszMWMsFUgJsXZt44Gqol5bnpcuPwggnhi0YamRNqGjqQbWABr6AqhsegVV8OsUsQdsfGr22IA/LBmIQcF0YAoTkmBhwiAel1A33xkkcyGARdIgLa+pEGNm59GMbWXOasKg2lETvr9wMfcv1e6yznBfgQ8qMVYx9G6w+QIDAQAB} notify_domain: ${API_NOTIFY_DOMAIN:http://127.0.0.1:8080/api/} app: