diff --git a/.idea/encodings.xml b/.idea/encodings.xml index fc773d2..541c9e1 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -7,6 +7,8 @@ + + diff --git a/.idea/misc.xml b/.idea/misc.xml index eeeade4..582b95c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -12,6 +12,11 @@ + diff --git a/bwie-common/src/main/java/com/bwie/common/domain/House.java b/bwie-common/src/main/java/com/bwie/common/domain/House.java index fc2941c..8ee7922 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/House.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/House.java @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 房源表 @@ -48,4 +49,6 @@ public class House { private Date createTime; //创建时间 private Date updateTime; //最近更新时间 private Integer isDelete; //逻辑删除字段 + private Integer houseOldNew; + private List imageAddr; } diff --git a/bwie-common/src/main/java/com/bwie/common/domain/HouseImages.java b/bwie-common/src/main/java/com/bwie/common/domain/HouseImages.java index a991225..ee5f59f 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/HouseImages.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/HouseImages.java @@ -1,5 +1,4 @@ package com.bwie.common.domain; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -7,17 +6,14 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; - @Data @Builder @AllArgsConstructor @NoArgsConstructor @TableName("house_images") public class HouseImages { - @TableId(type = IdType.AUTO) private Long id; //id private Long houseId; //房型id private String imageAddr; //图片地址 - } diff --git a/bwie-common/src/main/java/com/bwie/common/domain/Order.java b/bwie-common/src/main/java/com/bwie/common/domain/Order.java new file mode 100644 index 0000000..c8bb727 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/Order.java @@ -0,0 +1,37 @@ +package com.bwie.common.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 订单表 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class Order { + + private Long ordersId;//订单ID + private String ordersNumber;//订单编号 + private Long userId;//支付人ID + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyyy-MM-dd HH:mm:ss") + private Date ordersDate;//支付时间 + private String ordersWay;//支付方式 + private BigDecimal ordersPrice;//支付金额 + private Integer isDelete;//逻辑删除 + private Integer ordersStatus;//订单状态 + private Long houseId;//房源表ID + private String userTel;//支付人手机号 + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyyy-MM-dd HH:mm:ss") + private Date udpDate;//最新更改订单时间 +} diff --git a/bwie-common/src/main/resources/META-INF/spring.factories b/bwie-common/src/main/resources/META-INF/spring.factories index d638e57..728c0f4 100644 --- a/bwie-common/src/main/resources/META-INF/spring.factories +++ b/bwie-common/src/main/resources/META-INF/spring.factories @@ -3,4 +3,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ com.bwie.common.handler.GlobalExceptionHandle,\ com.bwie.common.config.RedisConfig,\ com.bwie.common.redis.RedisCache,\ - com.bwie.common.remote.factory.RemoteHouseFactory + com.bwie.common.remote.factory.RemoteHouseFactory,\ + com.bwie.common.remote.factory.RemoteLoginFactory diff --git a/bwie-modules/bwie-Alipay/pom.xml b/bwie-modules/bwie-Alipay/pom.xml new file mode 100644 index 0000000..7f91ad4 --- /dev/null +++ b/bwie-modules/bwie-Alipay/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + com.bwie + bwie-modules + 1.0.0 + + + bwie-Alipay + + + 8 + 8 + UTF-8 + + + + + com.bwie + bwie-common + + + + org.springframework.boot + spring-boot-starter-web + + + + + com.alipay.sdk + alipay-sdk-java + 4.39.2.ALL + + + + + com.alibaba + druid-spring-boot-starter + 1.2.8 + + + + mysql + mysql-connector-java + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.2.2 + + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.1 + + + + org.springframework.boot + spring-boot-starter-test + test + + + diff --git a/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/Alipay.java b/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/Alipay.java new file mode 100644 index 0000000..ae6a3e4 --- /dev/null +++ b/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/Alipay.java @@ -0,0 +1,24 @@ +package com.bwie.alipay; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +import java.math.BigDecimal; + +@Configuration +@ConfigurationProperties(prefix = "alipay") +@Data +public class Alipay { + + + private String privateKey;//私钥 + private String alipayPublicKey;//支付宝公钥 + private String appId;//商户ID + private String notifyUrl;// + private String returnUrl;// + private String serverUrl; + private String charset; + private String signType; + private BigDecimal ordersPrice; +} diff --git a/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/AlipayApplication.java b/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/AlipayApplication.java new file mode 100644 index 0000000..7bf1e29 --- /dev/null +++ b/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/AlipayApplication.java @@ -0,0 +1,14 @@ +package com.bwie.alipay; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; + +@SpringBootApplication +@MapperScan("com.bwie.alipay.mapper") +public class AlipayApplication { + public static void main(String[] args) { + SpringApplication.run(AlipayApplication.class); + } +} diff --git a/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/HouseList.java b/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/HouseList.java new file mode 100644 index 0000000..3a72175 --- /dev/null +++ b/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/HouseList.java @@ -0,0 +1,17 @@ +package com.bwie.alipay; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +import java.math.BigDecimal; + + +@Configuration +@ConfigurationProperties(prefix = "house") +@Data +public class HouseList { + + private Long houseId; + +} diff --git a/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/controller/AlipayController.java b/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/controller/AlipayController.java new file mode 100644 index 0000000..20dfe5c --- /dev/null +++ b/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/controller/AlipayController.java @@ -0,0 +1,24 @@ +package com.bwie.alipay.controller; + +import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; +import com.bwie.alipay.HouseList; +import com.bwie.alipay.service.AlipayService; +import com.bwie.common.domain.Order; +import com.bwie.common.result.Result; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/alipay") +public class AlipayController { + @Autowired + private AlipayService alipayService; + @GetMapping("/alipayway") + public Result alipay(){ + return alipayService.alipay(); + } +} diff --git a/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/mapper/AlipayMapper.java b/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/mapper/AlipayMapper.java new file mode 100644 index 0000000..0e37e6b --- /dev/null +++ b/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/mapper/AlipayMapper.java @@ -0,0 +1,7 @@ +package com.bwie.alipay.mapper; + +import org.apache.ibatis.annotations.Mapper; + +public interface AlipayMapper{ + +} diff --git a/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/service/AlipayService.java b/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/service/AlipayService.java new file mode 100644 index 0000000..2793410 --- /dev/null +++ b/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/service/AlipayService.java @@ -0,0 +1,10 @@ +package com.bwie.alipay.service; + +import com.bwie.alipay.HouseList; +import com.bwie.common.domain.Order; +import com.bwie.common.result.Result; + +public interface AlipayService { + + public Result alipay(); +} diff --git a/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/service/impl/AlipayServiceImpl.java b/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/service/impl/AlipayServiceImpl.java new file mode 100644 index 0000000..612198d --- /dev/null +++ b/bwie-modules/bwie-Alipay/src/main/java/com/bwie/alipay/service/impl/AlipayServiceImpl.java @@ -0,0 +1,85 @@ +package com.bwie.alipay.service.impl; + + +import cn.hutool.core.util.RandomUtil; +import com.alibaba.fastjson2.JSON; +import com.alipay.api.AlipayApiException; +import com.alipay.api.AlipayClient; +import com.alipay.api.DefaultAlipayClient; +import com.alipay.api.AlipayConfig; +import com.alipay.api.domain.AlipayTradePagePayModel; +import com.alipay.api.internal.util.AlipaySignature; +import com.alipay.api.response.AlipayTradePagePayResponse; +import com.alipay.api.request.AlipayTradePagePayRequest; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.bwie.alipay.Alipay; +import com.bwie.alipay.HouseList; +import com.bwie.alipay.service.AlipayService; +import com.bwie.common.domain.Order; +import com.bwie.common.result.Result; +import lombok.SneakyThrows; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +@RestController +@RequestMapping("/alipay") +public class AlipayServiceImpl implements AlipayService { + + + @Autowired + private HouseList houseList; + @Autowired + private Alipay alipay; + @SneakyThrows + @Override + public Result alipay(){ + Order order = new Order(); + order.setHouseId(houseList.getHouseId()); + order.setOrdersPrice(alipay.getOrdersPrice()); + AlipayConfig alipayConfig = new AlipayConfig(); + alipayConfig.setServerUrl(alipay.getServerUrl()); + alipayConfig.setAppId(alipay.getAppId()); + alipayConfig.setPrivateKey(alipay.getPrivateKey()); + alipayConfig.setAlipayPublicKey(alipay.getAlipayPublicKey()); + alipayConfig.setCharset(alipay.getCharset()); + alipayConfig.setSignType(alipay.getSignType()); + AlipayClient alipayClient = new DefaultAlipayClient(alipayConfig); + AlipayTradePagePayRequest request = new AlipayTradePagePayRequest(); + request.setNotifyUrl(alipay.getNotifyUrl()); + request.setReturnUrl(alipay.getReturnUrl()); + AlipayTradePagePayModel model = new AlipayTradePagePayModel(); + String jsonString = JSON.toJSONString(order.getOrdersPrice()); + model.setTotalAmount(jsonString); + String jsonString1 = JSON.toJSONString(order.getHouseId()); + model.setSubject(jsonString1); + String sout = "2015"; + String our = RandomUtil.randomNumbers(13); + String aa = sout+our; + model.setOutTradeNo(aa); + model.setProductCode("FAST_INSTANT_TRADE_PAY"); + request.setBizModel(model); + order.setOrdersNumber(aa); + + AlipayTradePagePayResponse response = alipayClient.pageExecute(request, "GET"); + // 如果需要返回GET请求，请使用 + // AlipayTradePagePayResponse response = alipayClient.pageExecute(request, "GET"); + String pageRedirectionData = response.getBody(); + System.out.println(pageRedirectionData); + if (response.isSuccess()) { + return Result.success("调用成功!!!!!"); + } else { + return Result.error("调用失败!!!!!"); + } + } +} diff --git a/bwie-modules/bwie-Alipay/src/main/resources/bootstrap.yml b/bwie-modules/bwie-Alipay/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..d5cd9b0 --- /dev/null +++ b/bwie-modules/bwie-Alipay/src/main/resources/bootstrap.yml @@ -0,0 +1,44 @@ +# Tomcat +server: + port: 9008 +# Spring +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/xm_house?useSSL=false&serverTimezone=UTC + username: root + password: admin111. + main: + allow-circular-references: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + # 应用名称 + name: bwie-alipay + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 124.221.177.197:8848 + config: + # 配置中心地址 + server-addr: 124.221.177.197:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +alipay: + serverUrl: "https://openapi-sandbox.dl.alipaydev.com/gateway.do" + charset: "UTF-8" + signType: "RSA2" + appId: "9021000135679979" + privateKey: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCx8r9WaFV7CujWc9AzpbgsCq8axYJWm4s7x2eDcJXC+qhDXWsFW0xDX+xs4JCuVJ54+FGiflB24BeqgFDLNOchtkocK65BJohG5ojVONHq/ciruqbzAD0W6x96h8fKqlVuvz3EotMXuejg5J1gbDRmgTvPx7mYq94TXjxt75CUEserThSMF0geB0DJhrPxNe5JLAPKA5pRXd2e6wDybi2yKL2s2j4YuaTgDZuNAnlBYAiV6Pk7WpFB06LtbGg7JiM+Jawn3N64fL/24d4VIzcJD3AxWbGDZAXtW9+XZtsDa8z6ik3OGpbrSKu+RK0jjWzT2ETHnb/BdhtDJzFBo4dnAgMBAAECggEBAKWvrWIqATVwof1Tlk8QhVxUklfuAP7dExYVA5fJ01fZhaQ7rjMtn+O3w+5YZb48QdXG+FPBIvCclMyHbzLVzkOAdJ6oOTamRwslCdDmd+ZCaH8lat8loLvfLs8q7+cPFD7qx/t30+7qhiAoHTSza1LqD6PWhkPV+w+zlbaS8d471COE8P7XyxouFZ70qe9Aa7uVLEClxQemviSqIYOuHTFkNjWMleQR48tL2HA2ifKpa309Ifnbf3kGktyNaiG7plC5x3gUU3dSQdWZpnRHq/wh65TBhJHgLrjsIPhnfB9mmwCMZ66EJiUKajuqlvEjC/J0dkduMO6uPLYzTkejxbkCgYEA4arhCQgLquzRJDk5pI94ZzBiSWXaP3JUzfYEHQbbzcNvRPZBYJLDBUXNRVReujjt6efIcyrCi1zD3XvHfN2QmaNubeD5yF7aObYPVwoxDCvqHzZDVbYd9ZUGR2yIa+jdkVc5py0vmyfyxLSx3RvMuSP+rYtzhCJbowQiCkN4XUMCgYEAyd3efuY/0f59XF2DBSu8vCEaer7Wkieit980VZm06jxwt/3b5UcRlknKpum32n+mGlbpu4M/r5Zbpta+uuWbx6ajbIjc43rMuElkK6cz5d6AUTm6AsOKq8ARQPh4F5pzI18vrNAQrNyVpxwDMXIdmyArHD0Dv4NeIjlwucCT2Q0CgYBTAXGoysbP5i+/bTUgrI0TF57vdIFkmP9MitNUgfNTqjFBYnsFtLX7OIOansABK3OHd/QpOG86p7J7w03LRgwsFwtFa101MH6Af9EAqQUFfxmsxV7bJhO7A0e9+dPsLUlibn0MWviJz5XieLx7ogAZkX3aA9NHpQOj4J9MuyiI1QKBgQC/NyIuNG5ZvWYEGzQjrsVtszHA+YqJEXBqGc0aFKoxgyUGtDoamdJH+Qg0SYl1OJsfshpfG7k02wlgJWSv5xVD7k45Xf9Wn5jSK/rt+skHQldsGXFgctelTx9I2tPvD8dmxyCC4ugYxi4gCEHiEYWHztXnPsiRHaAKbTyhR5EE9QKBgGQRjcds+qeZeNTKrwSPFG/KD8h/kI0jTnFfeKMm1WXfuXcadTavbaruGUihLzveO9/dsizKJm38Pc2j5xNyBxGYUdbSxGZtC5uNmYuIsR3u8gy2oT3qFBPaFp/Y1PoHzLu6QTAYeo8Cz0TG+U8ah/81O9JPzZWyrkGLHIp5XyKq" + alipayPublicKey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkVyIo6qyxzk0YWnBo3ueKIpcpUPnrX0MuhdaUAoyJPtp19u2M67g8jSw7BWqppJ0Vso8sm7Px6VS3rOunlmgW5lyN0uMgy6+mE76gW8+2msjwR/DrzNL7aQn2idu9NgxxKk2BnLzajpR7W5Tk+sXmB9woLffbQ9hJW+SWJ6DnMtAbaB+3E/xaDO4o5yjTFbY063Vr2mgyt+PfK5i3unb3ffZj9jtqICWsDfpoY42fxxrRsKa3eLCJVO6sqUz3XLRex8WV7vcjtAuMsp6rFbwTPT5ELSYHXEY3uWuHHJChDE4eAKUpvavYj/hTZhlsOyTe1xPOAbnkAQ2B+kA+XHDRQIDAQAB" + notifyUrl: "http://nrjjtd.natappfree.cc/nacos" + returnUrl: "http://nrjjtd.natappfree.cc/nacos" + ordersPrice: 99989 diff --git a/bwie-modules/bwie-Alipay/src/main/resources/mapper/SeeHouseMapper.xml b/bwie-modules/bwie-Alipay/src/main/resources/mapper/SeeHouseMapper.xml new file mode 100644 index 0000000..9805a97 --- /dev/null +++ b/bwie-modules/bwie-Alipay/src/main/resources/mapper/SeeHouseMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/bwie-modules/bwie-Alipay/src/test/java/com/example/alipay/AlipayDemoApplicationTests.java b/bwie-modules/bwie-Alipay/src/test/java/com/example/alipay/AlipayDemoApplicationTests.java new file mode 100644 index 0000000..8058c8e --- /dev/null +++ b/bwie-modules/bwie-Alipay/src/test/java/com/example/alipay/AlipayDemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.alipay; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class AlipayDemoApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/bwie-modules/bwie-ask/pom.xml b/bwie-modules/bwie-ask/pom.xml index 4e6328b..25a5d2f 100644 --- a/bwie-modules/bwie-ask/pom.xml +++ b/bwie-modules/bwie-ask/pom.xml @@ -18,55 +18,82 @@ UTF-8 7.17.0 + - - - com.bwie - bwie-common - - - xin.altitude.cms.common - ucode-cms-common - 1.3.4 - - org.springframework.boot spring-boot-starter-web - org.elasticsearch.client - elasticsearch-rest-high-level-client + com.baomidou + mybatis-plus-boot-starter + 3.4.2 - - - com.alibaba - druid-spring-boot-starter - 1.2.8 - - + mysql mysql-connector-java + runtime - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 2.2.2 + org.projectlombok + lombok + true - - com.github.pagehelper - pagehelper-spring-boot-starter - 1.4.1 + com.alipay.sdk + alipay-sdk-java + 4.22.110.ALL - + + + cn.hutool + hutool-all + 5.7.20 + + org.springframework.boot spring-boot-starter-test test + + + org.junit.vintage + junit-vintage-engine + + + + + org.springframework.cloud + spring-cloud-commons + + + com.bwie + bwie-common + + + com.alibaba + druid + 1.0.20 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + UTF-8 + + + + + diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/Test01.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/Test01.java new file mode 100644 index 0000000..f9c85ab --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/Test01.java @@ -0,0 +1,14 @@ +package com.bwie.ask.seriver; +/** + * 恶汉模式 + */ +public class Test01 { + //私有方法 + private Test01(){}; + //new 出来对象 + private static Test01 instance = new Test01(); + //返回new出啦的对象 + public static Test01 getInstance(){ + return instance; + } +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/Test02.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/Test02.java new file mode 100644 index 0000000..a42f472 --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/Test02.java @@ -0,0 +1,26 @@ +package com.bwie.ask.seriver; + +/** + * 懒汉模式 + */ +public class Test02 { + //私有方法 + private Test02(){}; + //使用volatile 赋值为空 + private static volatile Test02 intanse = null; + //静态方法双重判断 + public static Test02 getInstance(){ + if(intanse==null){ + synchronized (Test02.class){ + if(intanse==null){ + //创建对象 + intanse = new Test02(); + } + } + } + //返回创建对象 + return intanse; + } + + +} diff --git a/bwie-modules/bwie-es/src/main/java/com/bwie/es/service/impl/EsListServiceImpl.java b/bwie-modules/bwie-es/src/main/java/com/bwie/es/service/impl/EsListServiceImpl.java index cf4f223..1b2aa76 100644 --- a/bwie-modules/bwie-es/src/main/java/com/bwie/es/service/impl/EsListServiceImpl.java +++ b/bwie-modules/bwie-es/src/main/java/com/bwie/es/service/impl/EsListServiceImpl.java @@ -132,5 +132,6 @@ public class EsListServiceImpl implements EsListService { + } diff --git a/bwie-modules/bwie-es/src/main/java/com/bwie/es/sync/SyncHouseData.java b/bwie-modules/bwie-es/src/main/java/com/bwie/es/sync/SyncHouseData.java index 740f413..5ba5989 100644 --- a/bwie-modules/bwie-es/src/main/java/com/bwie/es/sync/SyncHouseData.java +++ b/bwie-modules/bwie-es/src/main/java/com/bwie/es/sync/SyncHouseData.java @@ -1,16 +1,16 @@ package com.bwie.es.sync; import com.bwie.common.domain.House; -import com.bwie.common.domain.request.HouseEsRequest; import com.bwie.common.remote.RemoteHouseService; import com.bwie.common.result.Result; +import com.bwie.es.service.EsListService; import com.bwie.es.service.EsService; //import com.xxl.job.core.handler.annotation.XxlJob; -import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.log4j.Log4j2; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.util.List; @@ -21,28 +21,47 @@ import java.util.List; public class SyncHouseData { private final RemoteHouseService remoteHouseService; - private final EsService esService; + private final EsListService esService; public SyncHouseData(RemoteHouseService remoteHouseService, - EsService esService) { + EsService esService, EsListService esService1) { this.remoteHouseService = remoteHouseService; - this.esService = esService; + this.esService = esService1; } // @XxlJob("managementList") + // @Scheduled(cron = "0/5 * * * * ?") +// public void buySync(){ +// Result> listResult = askBuyRentFeign.shouAll(); +// List data = listResult.getData(); +// if(data!=null){ +// esAskBuyService.shouList(data); +// } +// System.out.println("定时器求购正常启动!!!!!!"); +// +// Result> listResulta = askBuyRentFeign.shouList(); +// List dataa = listResulta.getData(); +// if(dataa!=null) { +// esAskRentService.shouListt(dataa); +// } +// System.out.println("定时器求租正常启动!!!!!!"); +// } + @Scheduled(cron = "0/5 * * * * ?") public void managementList(){ Result> shouall = remoteHouseService.shouall(); List data = shouall.getData(); - + if(data!=null){ + esService.managementSync(data); + } log.info("房源管理未卖出同步定时器启动>>>>>>>>>>"); } - @XxlJob("syncHouseData") - public void syncHouseData(){ - Result> houseEsList = remoteHouseService.getHouseEsList(); - if (houseEsList.getData() != null){ - esService.syncHouse(houseEsList.getData()); - } - log.info("同步定时器启动>>>>>>>>>>"); - } +// @XxlJob("syncHouseData") +// public void syncHouseData(){ +// Result> houseEsList = remoteHouseService.getHouseEsList(); +// if (houseEsList.getData() != null){ +// esService.syncHouse(houseEsList.getData()); +// } +// log.info("同步定时器启动>>>>>>>>>>"); +// } } diff --git a/bwie-modules/bwie-es/src/main/resources/bootstrap.yml b/bwie-modules/bwie-es/src/main/resources/bootstrap.yml index 3aa3150..b195f59 100644 --- a/bwie-modules/bwie-es/src/main/resources/bootstrap.yml +++ b/bwie-modules/bwie-es/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ es: # Tomcat server: - port: 9006 + port: 9010 # Spring spring: main: diff --git a/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/sync/AskBuySync.java b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/sync/AskBuySync.java index a118668..23d39fe 100644 --- a/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/sync/AskBuySync.java +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/sync/AskBuySync.java @@ -32,20 +32,20 @@ public class AskBuySync { this.esAskBuyService = esAskBuyService; } - @Scheduled(cron = "0/5 * * * * ?") - public void buySync(){ - Result> listResult = askBuyRentFeign.shouAll(); - List data = listResult.getData(); - if(data!=null){ - esAskBuyService.shouList(data); - } - System.out.println("定时器求购正常启动!!!!!!"); - - Result> listResulta = askBuyRentFeign.shouList(); - List dataa = listResulta.getData(); - if(dataa!=null) { - esAskRentService.shouListt(dataa); - } - System.out.println("定时器求租正常启动!!!!!!"); - } +// @Scheduled(cron = "0/5 * * * * ?") +// public void buySync(){ +// Result> listResult = askBuyRentFeign.shouAll(); +// List data = listResult.getData(); +// if(data!=null){ +// esAskBuyService.shouList(data); +// } +// System.out.println("定时器求购正常启动!!!!!!"); +// +// Result> listResulta = askBuyRentFeign.shouList(); +// List dataa = listResulta.getData(); +// if(dataa!=null) { +// esAskRentService.shouListt(dataa); +// } +// System.out.println("定时器求租正常启动!!!!!!"); +// } } diff --git a/bwie-modules/bwie-home/pom.xml b/bwie-modules/bwie-home/pom.xml index f85ab6e..8f59fb3 100644 --- a/bwie-modules/bwie-home/pom.xml +++ b/bwie-modules/bwie-home/pom.xml @@ -65,5 +65,17 @@ spring-boot-starter-test test + + com.xuxueli + xxl-job-core + 2.3.1 + compile + + + com.bwie + bwie-Alipay + 1.0.0 + compile + diff --git a/bwie-modules/bwie-home/src/main/java/com/bwie/home/controller/HouseController.java b/bwie-modules/bwie-home/src/main/java/com/bwie/home/controller/HouseController.java index 02381d6..4efc829 100644 --- a/bwie-modules/bwie-home/src/main/java/com/bwie/home/controller/HouseController.java +++ b/bwie-modules/bwie-home/src/main/java/com/bwie/home/controller/HouseController.java @@ -1,6 +1,7 @@ package com.bwie.home.controller; import com.bwie.common.domain.House; +import com.bwie.common.domain.Order; import com.bwie.common.domain.request.HouseEsRequest; import com.bwie.common.result.Result; import com.bwie.home.job.Reptile; @@ -32,7 +33,11 @@ public class HouseController { ); } - + //添加订单表 + @PostMapping("/wayOrdersPayment") + public Result wayOrdersPayment(@RequestBody Order order){ + return homeListService.wayOrdersPayment(order); + } @GetMapping("/shouall") public Result> shouall(){ return homeListService.shouall(); @@ -43,4 +48,19 @@ public class HouseController { reptile.reptile(page); return Result.success(); } + + @PostMapping("/addTwoHouse") + public Result addTwoHouse(@RequestBody House house){ + return homeListService.addTwoHouse(house); + } + + @GetMapping("/chaId") + public Result chaId(@RequestParam Integer houseId){ + return homeListService.chaId(houseId); + } + + + + + } diff --git a/bwie-modules/bwie-home/src/main/java/com/bwie/home/feign/AlipayFeign.java b/bwie-modules/bwie-home/src/main/java/com/bwie/home/feign/AlipayFeign.java new file mode 100644 index 0000000..2167882 --- /dev/null +++ b/bwie-modules/bwie-home/src/main/java/com/bwie/home/feign/AlipayFeign.java @@ -0,0 +1,15 @@ +package com.bwie.home.feign; + +import com.bwie.alipay.HouseList; +import com.bwie.common.result.Result; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +@FeignClient(value = "bwie-alipay",url = "http://127.0.0.1:9008") +public interface AlipayFeign { + @GetMapping("/alipay/alipayway") + public Result alipay(@RequestParam HouseList houseList); +} diff --git a/bwie-modules/bwie-home/src/main/java/com/bwie/home/mapper/HomeListMapper.java b/bwie-modules/bwie-home/src/main/java/com/bwie/home/mapper/HomeListMapper.java index 75b5561..17ba7db 100644 --- a/bwie-modules/bwie-home/src/main/java/com/bwie/home/mapper/HomeListMapper.java +++ b/bwie-modules/bwie-home/src/main/java/com/bwie/home/mapper/HomeListMapper.java @@ -2,9 +2,22 @@ package com.bwie.home.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bwie.common.domain.House; +import com.bwie.common.domain.Order; import java.util.List; public interface HomeListMapper extends BaseMapper { List shouall(); + + Integer addTwoHouse(House house); + + + void addImage(House house); + + Integer addwayOrders(Order order); + + + House chaId(Integer houseId); + + } diff --git a/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/HomeListService.java b/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/HomeListService.java index 843b05a..98b4a28 100644 --- a/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/HomeListService.java +++ b/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/HomeListService.java @@ -2,6 +2,7 @@ package com.bwie.home.service; import com.baomidou.mybatisplus.extension.service.IService; import com.bwie.common.domain.House; +import com.bwie.common.domain.Order; import com.bwie.common.result.Result; import org.springframework.stereotype.Service; @@ -10,4 +11,12 @@ import java.util.List; public interface HomeListService extends IService { public Result> shouall(); + + public Result addTwoHouse(House house);//添加房源表 + + + public Result wayOrdersPayment(Order order); + + public Result chaId(Integer houseId); + } diff --git a/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/impl/HomeListServiceImpl.java b/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/impl/HomeListServiceImpl.java index f2f9eff..f2a5240 100644 --- a/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/impl/HomeListServiceImpl.java +++ b/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/impl/HomeListServiceImpl.java @@ -1,8 +1,11 @@ package com.bwie.home.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bwie.alipay.HouseList; import com.bwie.common.domain.House; +import com.bwie.common.domain.Order; import com.bwie.common.result.Result; +import com.bwie.home.feign.AlipayFeign; import com.bwie.home.mapper.HomeListMapper; import com.bwie.home.service.HomeListService; import org.springframework.stereotype.Service; @@ -12,8 +15,11 @@ import java.util.List; @Service public class HomeListServiceImpl extends ServiceImpl implements HomeListService { private final HomeListMapper listMapper; - public HomeListServiceImpl(HomeListMapper listMapper) { + + private final AlipayFeign alipayFeign; + public HomeListServiceImpl(HomeListMapper listMapper, AlipayFeign alipayFeign) { this.listMapper = listMapper; + this.alipayFeign = alipayFeign; } @Override public Result> shouall(){ @@ -21,6 +27,37 @@ public class HomeListServiceImpl extends ServiceImpl imple return Result.success(list); } + @Override + public Result addTwoHouse(House house){ + Integer i = listMapper.addTwoHouse(house); + if(house.getImageAddr()==null){ + listMapper.addImage(house); + } + return Result.success(i>0?200:500,i>0?"发布成功!!!!":"发布失败!!!!!"); + } + + //支付订单 + @Override + public Result wayOrdersPayment(Order order){ + Integer i = listMapper.addwayOrders(order); + return Result.success(i>0?200:500,i>0?"订单添加成功":"订单添加失败!!!!!"); + } + + + //查询内容 + @Override + public Result chaId(Integer houseId){ + House house = listMapper.chaId(houseId); + HouseList houseList = new HouseList(); + houseList.setHouseId(house.getId()); + houseList.setOrdersPrice(house.getHousePrice()); + alipayFeign.alipay(houseList); + if(house!=null){ + return Result.success(house,"对象传送成功!!!!!!!!!!"); + } + return Result.error("查找的对象不存在,请重新尝试!!!!!!"); + } + diff --git a/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/impl/HomeServiceImpl.java b/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/impl/HomeServiceImpl.java index 17b8300..24e6ce7 100644 --- a/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/impl/HomeServiceImpl.java +++ b/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/impl/HomeServiceImpl.java @@ -1,4 +1,16 @@ package com.bwie.home.service.impl; -public class HomeServiceImpl { +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bwie.common.domain.House; +import com.bwie.common.result.Result; +import com.bwie.home.service.HomeService; +import org.springframework.stereotype.Service; + +@Service +public class HomeServiceImpl{ + + + + + } diff --git a/bwie-modules/bwie-home/src/main/resources/mapper/HomeListMapper.xml b/bwie-modules/bwie-home/src/main/resources/mapper/HomeListMapper.xml index 1850a3c..d75e80c 100644 --- a/bwie-modules/bwie-home/src/main/resources/mapper/HomeListMapper.xml +++ b/bwie-modules/bwie-home/src/main/resources/mapper/HomeListMapper.xml @@ -1,7 +1,28 @@ + + INSERT INTO `xm_house`.`house` (`user_id`, `title`, `estate`, `house_type_id`, `addr_id`, `house_addr`, `dictionary_type_id`, + `house_price`, `room_type`, `orientation`, `decorate`, `floor`, `acreage`, `selling_points`, `mentality`, `service_introduction`, `manager_status`, + `source`, `house_old_new`, `broker_id`, `is_success`, `verify`, `is_es`, `create_time`, `update_time`, `is_delete`) + VALUES (#{userId},#{title},#{estate},1,null,#{houseAddr},#{dictionaryTypeId},#{housePrice},#{roomType},#{orientation},#{decorate},#{floor}, #{acreage} + ,null,null,null,#{managerStatus},'贝壳网',1,1,1,0,0,#{createTime},null,0 ); + + + INSERT INTO `xm_house`.`house_images` (`house_id`, `image_addr`) + VALUES + + (#{id},#{imageAddr}) + + + + INSERT INTO `xm_house`.`orders` (`orders_number`, `user_id`, `orders_date`, `orders_way`, `orders_price`, `is_delete`, `orders_status`, `house_id`, `user_tel`) + VALUES (#{ordersNumber},1,now(),'支付宝',#{ordersPrice},,1,#{houseId},'17398472205'); + + diff --git a/bwie-modules/pom.xml b/bwie-modules/pom.xml index e43b682..343f21c 100644 --- a/bwie-modules/pom.xml +++ b/bwie-modules/pom.xml @@ -13,6 +13,7 @@ bwie-system bwie-group + bwie-Alipay 8