ufo / yohoufo-fore · Commits

Go to a project

Authored by tanling
Commit 6d8bf2ee3c9ecc5f1852eea80e846453879dcb1b 1 parent 8dd4cca6

test

Inline Side-by-side
Showing 21 changed files with 728 additions and 88 deletions
  1 +package com.yoho.ufo.common.util;
  2 +
  3 +import com.netflix.config.DynamicPropertyFactory;
  4 +import com.yoho.core.common.utils.AES;
  5 +import org.slf4j.Logger;
  6 +import org.slf4j.LoggerFactory;
  7 +
  8 +public class AddressUtil {
  9 +
  10 + private final static Logger logger = LoggerFactory.getLogger(AddressUtil.class);
  11 +
  12 + /**
  13 + * 解密地址
  14 + * @param str
  15 + * @return
  16 + */
  17 + public static String getDecryptStr(String str){
  18 +
  19 + String decryptStr = str;
  20 + try{
  21 + str = str.replace(' ','+');
  22 + decryptStr = AES.decrypt(DynamicPropertyFactory.getInstance().getStringProperty("password.aes.key", "yoho9646yoho9646").get(), str);
  23 + }catch (Exception e){
  24 + logger.error("getDecryptStr failed. str is {}, e is {}", str, e);
  25 + }
  26 +
  27 + logger.info("getDecryptStr, str is {}, decryptStr is {}", str, decryptStr);
  28 +
  29 + return decryptStr;
  30 +
  31 + }
  32 +}
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> 2 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3 - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> 3 + <component name="FacetManager">
  4 + <facet type="Spring" name="Spring">
  5 + <configuration />
  6 + </facet>
  7 + </component>
  8 + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4 <output url="file://$MODULE_DIR$/target/classes" /> 9 <output url="file://$MODULE_DIR$/target/classes" />
5 <output-test url="file://$MODULE_DIR$/target/test-classes" /> 10 <output-test url="file://$MODULE_DIR$/target/test-classes" />
6 <content url="file://$MODULE_DIR$"> 11 <content url="file://$MODULE_DIR$">
@@ -10,9 +15,20 @@ @@ -10,9 +15,20 @@
10 </content> 15 </content>
11 <orderEntry type="inheritedJdk" /> 16 <orderEntry type="inheritedJdk" />
12 <orderEntry type="sourceFolder" forTests="false" /> 17 <orderEntry type="sourceFolder" forTests="false" />
13 - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />  
14 - <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />  
15 <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.4-SNAPSHOT" level="project" /> 18 <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.4-SNAPSHOT" level="project" />
  19 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.4-SNAPSHOT" level="project" />
  20 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.4-SNAPSHOT" level="project" />
  21 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.4-SNAPSHOT" level="project" />
  22 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.4-SNAPSHOT" level="project" />
  23 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.4-SNAPSHOT" level="project" />
  24 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.4-SNAPSHOT" level="project" />
  25 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.4-SNAPSHOT" level="project" />
  26 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.4-SNAPSHOT" level="project" />
  27 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.4-SNAPSHOT" level="project" />
  28 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.4-SNAPSHOT" level="project" />
  29 + <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.4-SNAPSHOT" level="project" />
  30 + <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.4-SNAPSHOT" level="project" />
  31 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.5-SNAPSHOT" level="project" />
16 <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" /> 32 <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" />
17 <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" /> 33 <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" />
18 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" /> 34 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" />
@@ -27,30 +43,29 @@ @@ -27,30 +43,29 @@
27 <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" /> 43 <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" />
28 <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" /> 44 <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" />
29 <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" /> 45 <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" />
30 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.4-SNAPSHOT" level="project" /> 46 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.5-SNAPSHOT" level="project" />
31 <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" /> 47 <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" />
32 <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" /> 48 <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
33 <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" /> 49 <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
34 <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" /> 50 <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
35 <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" /> 51 <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" />
36 <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" /> 52 <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" />
37 - <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.4-SNAPSHOT" level="project" /> 53 + <orderEntry type="module" module-name="error-code" />
38 <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" /> 54 <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" />
39 - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />  
40 <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" /> 55 <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" />
41 <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> 56 <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" />
42 <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" /> 57 <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" />
43 <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> 58 <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" />
44 <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> 59 <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" />
45 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.4-SNAPSHOT" level="project" /> 60 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.5-SNAPSHOT" level="project" />
46 <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" /> 61 <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" />
47 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" /> 62 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
48 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" /> 63 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
49 <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" /> 64 <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" />
50 <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" /> 65 <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" />
51 <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" /> 66 <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" />
52 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.4-SNAPSHOT" level="project" />  
53 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.4-SNAPSHOT" level="project" /> 67 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.5-SNAPSHOT" level="project" />
  68 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.5-SNAPSHOT" level="project" />
54 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" /> 69 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" />
55 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" /> 70 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" />
56 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" /> 71 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" />
@@ -68,9 +83,9 @@ @@ -68,9 +83,9 @@
68 <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" /> 83 <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
69 <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" /> 84 <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
70 <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" /> 85 <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" />
71 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.4-SNAPSHOT" level="project" /> 86 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.5-SNAPSHOT" level="project" />
72 <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> 87 <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
73 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.4-SNAPSHOT" level="project" /> 88 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.5-SNAPSHOT" level="project" />
74 <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> 89 <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
75 <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> 90 <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
76 <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" /> 91 <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" />
@@ -80,13 +95,13 @@ @@ -80,13 +95,13 @@
80 <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" /> 95 <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" />
81 <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" /> 96 <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" />
82 <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" /> 97 <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" />
83 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.4-SNAPSHOT" level="project" />  
84 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.4-SNAPSHOT" level="project" />  
85 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.4-SNAPSHOT" level="project" /> 98 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.5-SNAPSHOT" level="project" />
  99 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.5-SNAPSHOT" level="project" />
  100 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.5-SNAPSHOT" level="project" />
86 <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" /> 101 <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" />
87 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" /> 102 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" />
88 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" /> 103 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" />
89 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.4-SNAPSHOT" level="project" /> 104 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.5-SNAPSHOT" level="project" />
90 <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" /> 105 <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" />
91 <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" /> 106 <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" />
92 <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" /> 107 <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" />
@@ -116,6 +131,7 @@ @@ -116,6 +131,7 @@
116 <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> 131 <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
117 <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" /> 132 <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" />
118 <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> 133 <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
  134 + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
119 <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> 135 <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
120 <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" /> 136 <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
121 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" /> 137 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" />
@@ -133,16 +149,17 @@ @@ -133,16 +149,17 @@
133 <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" /> 149 <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
134 <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> 150 <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
135 <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" /> 151 <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
136 - <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.4-SNAPSHOT" level="project" />  
137 - <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.4-SNAPSHOT" level="project" /> 152 + <orderEntry type="module" module-name="uic-service-model" />
  153 + <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.5-SNAPSHOT" level="project" />
138 <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" /> 154 <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" />
139 <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" /> 155 <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
140 <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> 156 <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
  157 + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
141 <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> 158 <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" />
142 <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" /> 159 <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" />
143 <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" /> 160 <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
144 - <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.4-SNAPSHOT" level="project" />  
145 - <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.4-SNAPSHOT" level="project" />  
146 - <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.4-SNAPSHOT" level="project" /> 161 + <orderEntry type="module" module-name="resource-service-model" />
  162 + <orderEntry type="module" module-name="users-service-model" />
  163 + <orderEntry type="module" module-name="shops-service-model" />
147 </component> 164 </component>
148 </module> 165 </module>
1 package com.yohoufo.order.dal; 1 package com.yohoufo.order.dal;
2 2
3 import com.yohoufo.order.dal.model.SellerOrder; 3 import com.yohoufo.order.dal.model.SellerOrder;
  4 +import org.apache.ibatis.annotations.Param;
4 5
5 public interface SellerOrderMapper { 6 public interface SellerOrderMapper {
6 int deleteByPrimaryKey(Integer id); 7 int deleteByPrimaryKey(Integer id);
@@ -11,6 +12,8 @@ public interface SellerOrderMapper { @@ -11,6 +12,8 @@ public interface SellerOrderMapper {
11 12
12 SellerOrder selectByPrimaryKey(Integer id); 13 SellerOrder selectByPrimaryKey(Integer id);
13 14
  15 + SellerOrder selectBySkup(@Param("skup") Integer skup);
  16 +
14 int updateByPrimaryKeySelective(SellerOrder record); 17 int updateByPrimaryKeySelective(SellerOrder record);
15 18
16 int updateByPrimaryKey(SellerOrder record); 19 int updateByPrimaryKey(SellerOrder record);
@@ -27,6 +27,18 @@ public class SellerOrderGoods { @@ -27,6 +27,18 @@ public class SellerOrderGoods {
27 27
28 private Byte status; 28 private Byte status;
29 29
  30 +
  31 + private String imageUrl;
  32 +
  33 +
  34 + public String getImageUrl() {
  35 + return imageUrl;
  36 + }
  37 +
  38 + public void setImageUrl(String imageUrl) {
  39 + this.imageUrl = imageUrl;
  40 + }
  41 +
30 public Integer getId() { 42 public Integer getId() {
31 return id; 43 return id;
32 } 44 }
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.yohoufo.order.dal.SellerOrderGoodsMapper"> 3 <mapper namespace="com.yohoufo.order.dal.SellerOrderGoodsMapper">
4 - <resultMap id="BaseResultMap" type="com.yohoufo.order.dal.model.SellerOrderGoods"> 4 + <resultMap id="BaseResultMap" type="om.yohoufo.order.dal.model.SellerOrderGoods">
5 <id column="id" jdbcType="INTEGER" property="id" /> 5 <id column="id" jdbcType="INTEGER" property="id" />
6 <result column="product_id" jdbcType="INTEGER" property="productId" /> 6 <result column="product_id" jdbcType="INTEGER" property="productId" />
7 <result column="product_name" jdbcType="VARCHAR" property="productName" /> 7 <result column="product_name" jdbcType="VARCHAR" property="productName" />
@@ -14,10 +14,11 @@ @@ -14,10 +14,11 @@
14 <result column="color_name" jdbcType="VARCHAR" property="colorName" /> 14 <result column="color_name" jdbcType="VARCHAR" property="colorName" />
15 <result column="goods_price" jdbcType="DECIMAL" property="goodsPrice" /> 15 <result column="goods_price" jdbcType="DECIMAL" property="goodsPrice" />
16 <result column="status" jdbcType="TINYINT" property="status" /> 16 <result column="status" jdbcType="TINYINT" property="status" />
  17 + <result column="image_url" jdbcType="VARCHAR" property="imageUrl" />
17 </resultMap> 18 </resultMap>
18 <sql id="Base_Column_List"> 19 <sql id="Base_Column_List">
19 id, product_id, product_name, storage_id, depot_no, size_id, size_name, goods_id, 20 id, product_id, product_name, storage_id, depot_no, size_id, size_name, goods_id,
20 - color_id, color_name, goods_price, status 21 + color_id, color_name, goods_price, status, image_url
21 </sql> 22 </sql>
22 <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> 23 <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
23 select 24 select
@@ -25,11 +26,16 @@ @@ -25,11 +26,16 @@
25 from seller_order_goods 26 from seller_order_goods
26 where id = #{id,jdbcType=INTEGER} 27 where id = #{id,jdbcType=INTEGER}
27 </select> 28 </select>
  29 +
  30 +
  31 +
  32 +
  33 +
28 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> 34 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
29 delete from seller_order_goods 35 delete from seller_order_goods
30 where id = #{id,jdbcType=INTEGER} 36 where id = #{id,jdbcType=INTEGER}
31 </delete> 37 </delete>
32 - <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.order.dal.model.SellerOrderGoods" useGeneratedKeys="true"> 38 + <insert id="insert" keyColumn="id" keyProperty="id" parameterType="om.yohoufo.order.dal.model.SellerOrderGoods" useGeneratedKeys="true">
33 insert into seller_order_goods (product_id, product_name, storage_id, 39 insert into seller_order_goods (product_id, product_name, storage_id,
34 depot_no, size_id, size_name, 40 depot_no, size_id, size_name,
35 goods_id, color_id, color_name, 41 goods_id, color_id, color_name,
@@ -39,7 +45,7 @@ @@ -39,7 +45,7 @@
39 #{goodsId,jdbcType=INTEGER}, #{colorId,jdbcType=SMALLINT}, #{colorName,jdbcType=VARCHAR}, 45 #{goodsId,jdbcType=INTEGER}, #{colorId,jdbcType=SMALLINT}, #{colorName,jdbcType=VARCHAR},
40 #{goodsPrice,jdbcType=DECIMAL}, #{status,jdbcType=TINYINT}) 46 #{goodsPrice,jdbcType=DECIMAL}, #{status,jdbcType=TINYINT})
41 </insert> 47 </insert>
42 - <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.order.dal.model.SellerOrderGoods" useGeneratedKeys="true"> 48 + <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="om.yohoufo.order.dal.model.SellerOrderGoods" useGeneratedKeys="true">
43 insert into seller_order_goods 49 insert into seller_order_goods
44 <trim prefix="(" suffix=")" suffixOverrides=","> 50 <trim prefix="(" suffix=")" suffixOverrides=",">
45 <if test="productId != null"> 51 <if test="productId != null">
@@ -112,7 +118,7 @@ @@ -112,7 +118,7 @@
112 </if> 118 </if>
113 </trim> 119 </trim>
114 </insert> 120 </insert>
115 - <update id="updateByPrimaryKeySelective" parameterType="com.yohoufo.order.dal.model.SellerOrderGoods"> 121 + <update id="updateByPrimaryKeySelective" parameterType="om.yohoufo.order.dal.model.SellerOrderGoods">
116 update seller_order_goods 122 update seller_order_goods
117 <set> 123 <set>
118 <if test="productId != null"> 124 <if test="productId != null">
@@ -151,7 +157,7 @@ @@ -151,7 +157,7 @@
151 </set> 157 </set>
152 where id = #{id,jdbcType=INTEGER} 158 where id = #{id,jdbcType=INTEGER}
153 </update> 159 </update>
154 - <update id="updateByPrimaryKey" parameterType="com.yohoufo.order.dal.model.SellerOrderGoods"> 160 + <update id="updateByPrimaryKey" parameterType="om.yohoufo.order.dal.model.SellerOrderGoods">
155 update seller_order_goods 161 update seller_order_goods
156 set product_id = #{productId,jdbcType=INTEGER}, 162 set product_id = #{productId,jdbcType=INTEGER},
157 product_name = #{productName,jdbcType=VARCHAR}, 163 product_name = #{productName,jdbcType=VARCHAR},
@@ -25,6 +25,16 @@ @@ -25,6 +25,16 @@
25 from seller_order 25 from seller_order
26 where id = #{id,jdbcType=INTEGER} 26 where id = #{id,jdbcType=INTEGER}
27 </select> 27 </select>
  28 +
  29 + <select id="selectBySkup" parameterType="java.lang.Integer" resultMap="BaseResultMap">
  30 + select
  31 + <include refid="Base_Column_List" />
  32 + from seller_order
  33 + where skup = #{skup,jdbcType=INTEGER}
  34 + limit 1
  35 + </select>
  36 +
  37 +
28 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> 38 <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
29 delete from seller_order 39 delete from seller_order
30 where id = #{id,jdbcType=INTEGER} 40 where id = #{id,jdbcType=INTEGER}
@@ -25,5 +25,9 @@ @@ -25,5 +25,9 @@
25 <groupId>javax.servlet</groupId> 25 <groupId>javax.servlet</groupId>
26 <artifactId>javax.servlet-api</artifactId> 26 <artifactId>javax.servlet-api</artifactId>
27 </dependency> 27 </dependency>
  28 + <dependency>
  29 + <groupId>com.yohoufo.fore</groupId>
  30 + <artifactId>yohoufo-fore-dal</artifactId>
  31 + </dependency>
28 </dependencies> 32 </dependencies>
29 </project> 33 </project>
  1 +package com.yohoufo.order.common;
  2 +
  3 +
  4 +
  5 +public enum SellerOrderStatus {
  6 +
  7 + WAITING_PAY(0, "待付保证金"),
  8 + SELLER_CANCEL_PAY(1, "上架关闭(卖家取消支付)"),
  9 + SELLER_CANCEL_TIMEOUT(2, "上架关闭(卖家支付超时)"),
  10 + HAS_PAYED(3, "已支付"),
  11 + SELLER_CANCEL_SELL(4, "上架关闭(卖家取消出售)"),
  12 + BACKGROUNP_CANCEL_SELL(5, "上架关闭(平台取消出售)"),
  13 + HAS_SELLED(6, "已售出");
  14 +
  15 +
  16 + SellerOrderStatus(int code, String desc) {
  17 + this.code = code;
  18 + this.desc = desc;
  19 + }
  20 +
  21 + int code;
  22 +
  23 + String desc;
  24 +
  25 + public String getDesc() {
  26 + return desc;
  27 + }
  28 +
  29 + public void setDesc(String desc) {
  30 + this.desc = desc;
  31 + }
  32 +
  33 + public int getCode() {
  34 + return code;
  35 + }
  36 +
  37 + public void setCode(int code) {
  38 + this.code = code;
  39 + }
  40 +}
  1 +package com.yohoufo.order.common;
  2 +
  3 +public enum SkupStatus {
  4 +
  5 + CAN_SELL(1),
  6 + CAN_NOT_SELL(0);
  7 +
  8 + SkupStatus(int code) {
  9 + this.code = code;
  10 + }
  11 +
  12 + int code;
  13 +
  14 + public int getCode() {
  15 + return code;
  16 + }
  17 +
  18 + public void setCode(int code) {
  19 + this.code = code;
  20 + }
  21 +}
  1 +package com.yohoufo.order.constants;
  2 +
  3 +public interface OrderConstant {
  4 +
  5 + // 在线支付
  6 + int PAYMENT_ONLINE = 1;
  7 +
  8 + String PAYMENT_ONLINE_NAME = "在线支付";
  9 +
  10 + // 顺丰快递
  11 + int DELIVERY_WAY_SF = 2;
  12 +
  13 + String DELIVERY_WAY_SF_NAME = "顺丰速运";
  14 +
  15 + int DELIVERY_WAY_SF_COST = 15;
  16 +
  17 + String GOODS_PRICE = "商品金额";
  18 +
  19 + String DELIVERY_DESC = "运费";
  20 +
  21 + String GOODS_REAL_PRICE = "实付金额";
  22 +
  23 + String MONEY_SIGN = "¥";
  24 +
  25 + String PLUS_SIGN = "+";
  26 +
  27 + String DAMAGES_DESC = "如卖家原因导致交易失败，您将获得赔偿金";
  28 +
  29 + String MONEY_UNIT = "元";
  30 +
  31 +
  32 +}
@@ -19,10 +19,20 @@ public class ShoppingController { @@ -19,10 +19,20 @@ public class ShoppingController {
19 IShoppingService shoppingService; 19 IShoppingService shoppingService;
20 20
21 21
  22 + /**
  23 + * 结算
  24 + * @param shoppingRequest
  25 + * @return
  26 + */
22 @RequestMapping("/payment") 27 @RequestMapping("/payment")
23 @ResponseBody 28 @ResponseBody
24 public ShoppingPaymentResponse payment(@RequestBody ShoppingRequest shoppingRequest){ 29 public ShoppingPaymentResponse payment(@RequestBody ShoppingRequest shoppingRequest){
25 30
26 - return null; 31 + return shoppingService.payment(shoppingRequest);
27 } 32 }
  33 +
  34 +
  35 +
  36 +
  37 +
28 } 38 }
@@ -5,7 +5,20 @@ import lombok.Data; @@ -5,7 +5,20 @@ import lombok.Data;
5 @Data 5 @Data
6 public class ShoppingRequest { 6 public class ShoppingRequest {
7 7
8 - private String skup; 8 + private int skup;
  9 +
  10 + private int uid;
  11 +
  12 + /**
  13 + * 加密过的地址Id
  14 + */
  15 + private String addressId;
  16 +
  17 + /**
  18 + * 客户端类型
  19 + */
  20 + private String clientType;
  21 +
  22 +
9 23
10 - private String uid;  
11 } 24 }
1 package com.yohoufo.order.response; 1 package com.yohoufo.order.response;
2 2
3 import lombok.Data; 3 import lombok.Data;
  4 +import lombok.ToString;
  5 +
  6 +import java.math.BigDecimal;
  7 +import java.util.List;
4 8
5 @Data 9 @Data
  10 +@ToString
6 public class ShoppingPaymentResponse { 11 public class ShoppingPaymentResponse {
  12 +
  13 + /**
  14 + * 支付方式:在线支付
  15 + */
  16 + PaymentWay paymentWay;
  17 +
  18 + /**
  19 + * 快递方式
  20 + */
  21 + DeliveryWay deliveryWay;
  22 +
  23 + /**
  24 + * 商品情报
  25 + */
  26 + List<Goods> goodsList;
  27 +
  28 + /**
  29 + * 费用列表
  30 + */
  31 + List<PromotionFormula> promotionFormulaList;
  32 +
  33 + /**
  34 + * 赔偿金文案
  35 + */
  36 + String damagesDesc;
  37 +
  38 + @Data
  39 + @ToString
  40 + public static class PaymentWay{
  41 +
  42 + private int paymentType;
  43 +
  44 + private String paymentTypeName;
  45 +
  46 + }
  47 +
  48 + @Data
  49 + @ToString
  50 + public static class DeliveryWay{
  51 +
  52 + /**
  53 + * 快递方式
  54 + */
  55 + private int deliveryWayId;
  56 +
  57 + private String deliveryWayName;
  58 +
  59 + private int deliveryWayCost;
  60 + }
  61 +
  62 + @Data
  63 + @ToString
  64 + public static class Goods{
  65 +
  66 + // 封面图
  67 + private String goodsImg;
  68 +
  69 + private String productName;
  70 +
  71 + private int colorId;
  72 + private String color;
  73 +
  74 + private int sizeId;
  75 + private String sizeName;
  76 +
  77 + private int buyNumber;
  78 + private BigDecimal salePrice;
  79 +
  80 + }
  81 +
  82 + @Data
  83 + @ToString
  84 + public static class PromotionFormula{
  85 +
  86 + private String promotion;
  87 + private String promotionAmount;
  88 + }
7 } 89 }
1 package com.yohoufo.order.service; 1 package com.yohoufo.order.service;
2 2
3 3
  4 +import com.yohoufo.order.request.ShoppingRequest;
  5 +import com.yohoufo.order.response.ShoppingPaymentResponse;
  6 +
4 public interface IShoppingService { 7 public interface IShoppingService {
  8 +
  9 + /**
  10 + * 结算页数据
  11 + * @param shoppingRequest
  12 + * @return
  13 + */
  14 + public ShoppingPaymentResponse payment(ShoppingRequest shoppingRequest);
5 } 15 }
  1 +package com.yohoufo.order.service.impl;
  2 +
  3 +import com.yoho.core.common.utils.DateUtil;
  4 +import com.yohoufo.order.common.SellerOrderStatus;
  5 +import com.yohoufo.order.common.SkupStatus;
  6 +import com.yohoufo.order.dal.*;
  7 +import com.yohoufo.order.dal.model.BuyerOrder;
  8 +import com.yohoufo.order.dal.model.SellerOrder;
  9 +import com.yohoufo.order.dal.model.SellerOrderGoods;
  10 +import org.springframework.beans.factory.annotation.Autowired;
  11 +import org.springframework.stereotype.Service;
  12 +import org.springframework.transaction.annotation.Transactional;
  13 +
  14 +@Service
  15 +public class OrdeCreationServiceImpl {
  16 +
  17 +
  18 +
  19 + @Autowired
  20 + SellerOrderGoodsMapper sellerOrderGoodsMapper;
  21 +
  22 + @Autowired
  23 + SellerOrderMapper sellerOrderMapper;
  24 +
  25 + @Autowired
  26 + BuyerOrderMapper buyerOrderMapper;
  27 +
  28 + @Autowired
  29 + BuyerOrderGoodsMapper buyerOrderGoodsMapper;
  30 +
  31 + @Autowired
  32 + BuyerOrderMetaMapper buyerOrderMetaMapper;
  33 +
  34 +
  35 + /**
  36 + * 创建订单
  37 + */
  38 + @Transactional
  39 + public void create(int skup, int productId, long orderCode, int uid, String clientType){
  40 +
  41 + try{
  42 +
  43 + // 扣减库存,入口参数:skup, product_id TODO
  44 +
  45 + // 1.skup不可售
  46 + // 2.卖家订单，skup已经售出
  47 +
  48 + SellerOrderGoods sellerOrderGoods = new SellerOrderGoods();
  49 + sellerOrderGoods.setId(skup);
  50 + sellerOrderGoods.setStatus((byte)SkupStatus.CAN_NOT_SELL.getCode());
  51 + sellerOrderGoodsMapper.updateByPrimaryKeySelective(sellerOrderGoods);
  52 +
  53 +
  54 + // 根据skup 查询卖家订单 ==> 卖家uid
  55 + SellerOrder sellerOrder = sellerOrderMapper.selectBySkup(skup);
  56 + sellerOrder.setUpdateTime(DateUtil.getCurrentTimeSecond());
  57 + sellerOrder.setStatus((byte) SellerOrderStatus.HAS_SELLED.getCode());
  58 + sellerOrderMapper.updateByPrimaryKeySelective(sellerOrder);
  59 +
  60 + // 订单入口
  61 + BuyerOrder buyerOrder = new BuyerOrder();
  62 + buyerOrder.setUid(uid);
  63 + buyerOrder.setOrderCode(orderCode);
  64 + buyerOrder.setSellerUid(sellerOrder.getUid());
  65 +// buyerOrder.setPaymentType();
  66 +
  67 +
  68 + buyerOrderMapper.insert(buyerOrder);
  69 +
  70 +
  71 + }catch (Exception e){
  72 + throw e;
  73 + }
  74 +
  75 + }
  76 +}
@@ -2,31 +2,124 @@ package com.yohoufo.order.service.impl; @@ -2,31 +2,124 @@ package com.yohoufo.order.service.impl;
2 2
3 import com.yoho.error.ServiceError; 3 import com.yoho.error.ServiceError;
4 import com.yoho.error.exception.ServiceException; 4 import com.yoho.error.exception.ServiceException;
  5 +import com.yoho.service.model.consts.Constant;
  6 +import com.yohoufo.order.common.SkupStatus;
  7 +import com.yohoufo.order.constants.OrderConstant;
  8 +import com.yohoufo.order.dal.SellerOrderGoodsMapper;
  9 +import com.yohoufo.order.dal.model.SellerOrderGoods;
5 import com.yohoufo.order.request.ShoppingRequest; 10 import com.yohoufo.order.request.ShoppingRequest;
6 import com.yohoufo.order.response.ShoppingPaymentResponse; 11 import com.yohoufo.order.response.ShoppingPaymentResponse;
7 import com.yohoufo.order.service.IShoppingService; 12 import com.yohoufo.order.service.IShoppingService;
  13 +import com.yohoufo.order.service.support.ShoppingSupport;
  14 +import com.yohoufo.order.service.support.codegenerator.OrderCodeGenerator;
8 import org.apache.commons.lang3.StringUtils; 15 import org.apache.commons.lang3.StringUtils;
9 import org.slf4j.Logger; 16 import org.slf4j.Logger;
10 import org.slf4j.LoggerFactory; 17 import org.slf4j.LoggerFactory;
  18 +import org.springframework.beans.factory.annotation.Autowired;
  19 +import org.springframework.stereotype.Service;
11 20
  21 +import java.math.BigDecimal;
  22 +import java.util.Arrays;
  23 +
  24 +@Service
12 public class ShoppingServiceImpl implements IShoppingService{ 25 public class ShoppingServiceImpl implements IShoppingService{
13 26
14 private final Logger logger = LoggerFactory.getLogger(getClass()); 27 private final Logger logger = LoggerFactory.getLogger(getClass());
15 28
  29 + @Autowired
  30 + ShoppingSupport shoppingSupport;
  31 +
  32 + @Autowired
  33 + SellerOrderGoodsMapper sellerOrderGoodsMapper;
  34 +
  35 + @Autowired
  36 + OrderCodeGenerator orderCodeGenerator;
  37 +
  38 + /**
  39 + * 结算页数据
  40 + * @param shoppingRequest
  41 + * @return
  42 + */
16 public ShoppingPaymentResponse payment(ShoppingRequest shoppingRequest){ 43 public ShoppingPaymentResponse payment(ShoppingRequest shoppingRequest){
17 44
18 // 入口参数检查 45 // 入口参数检查
19 - if (StringUtils.isEmpty(shoppingRequest.getUid())  
20 - || StringUtils.isEmpty(shoppingRequest.getSkup())){ 46 + if (shoppingRequest.getUid()<0
  47 + || shoppingRequest.getSkup()<0){
21 logger.warn("payment uid or skup is null"); 48 logger.warn("payment uid or skup is null");
22 // TODO 49 // TODO
23 throw new ServiceException(ServiceError.ORDER_REQUEST_ERROR); 50 throw new ServiceException(ServiceError.ORDER_REQUEST_ERROR);
24 } 51 }
25 52
26 // skup是否是可售状态 53 // skup是否是可售状态
27 - 54 + SellerOrderGoods skup = sellerOrderGoodsMapper.selectByPrimaryKey(shoppingRequest.getSkup());
  55 + if (skup == null){
  56 + logger.warn("payment skup not exist, skup is {}", shoppingRequest.getSkup());
  57 + // TODO
  58 + throw new ServiceException(ServiceError.ORDER_REQUEST_ERROR);
  59 + }
  60 +
  61 + // 不可售
  62 + if (skup.getStatus()!=null
  63 + && skup.getStatus().intValue() != SkupStatus.CAN_SELL.getCode()){
  64 + logger.warn("payment skup status, skup is {}", shoppingRequest.getSkup());
  65 + throw new ServiceException(ServiceError.ORDER_REQUEST_ERROR);
  66 + }
28 67
  68 + ShoppingPaymentResponse response = new ShoppingPaymentResponse();
  69 + response.setPaymentWay(shoppingSupport.getPaymentWay());
  70 + response.setDeliveryWay(shoppingSupport.getDeliverWay());
  71 + response.setGoodsList(Arrays.asList(shoppingSupport.getGoodsInfo(skup)));
  72 + response.setPromotionFormulaList(shoppingSupport.getPromotionFormula(skup));
29 73
30 - return null; 74 + // TODO 赔偿金计算
  75 + response.setDamagesDesc(shoppingSupport.getDamagesDesc(null));
  76 +
  77 + return response;
31 } 78 }
  79 +
  80 +
  81 + public void submit(ShoppingRequest shoppingRequest){
  82 +
  83 + // 入口参数检查
  84 + if (shoppingRequest.getSkup() < 0
  85 + || shoppingRequest.getUid() < 0
  86 + || StringUtils.isEmpty(shoppingRequest.getAddressId())){
  87 + logger.warn("submit param is null");
  88 + // TODO
  89 + throw new ServiceException(ServiceError.ORDER_REQUEST_ERROR);
  90 + }
  91 +
  92 + // 创建订单
  93 + // 校验 skup是否是可售
  94 + SellerOrderGoods skup = sellerOrderGoodsMapper.selectByPrimaryKey(shoppingRequest.getSkup());
  95 + if (skup == null){
  96 + logger.warn("payment skup not exist, skup is {}", shoppingRequest.getSkup());
  97 + // TODO
  98 + throw new ServiceException(ServiceError.ORDER_REQUEST_ERROR);
  99 + }
  100 +
  101 + // 不可售
  102 + if (skup.getStatus()!=null
  103 + && skup.getStatus().intValue() != SkupStatus.CAN_SELL.getCode()){
  104 + logger.warn("payment skup status, skup is {}", shoppingRequest.getSkup());
  105 + throw new ServiceException(ServiceError.ORDER_REQUEST_ERROR);
  106 + }
  107 +
  108 + // 生成订单号 TODO
  109 + long orderCode = orderCodeGenerator.generate();
  110 + // 减库存，skup更新成不可售，入库
  111 +
  112 +
  113 +
  114 +
  115 +
  116 + // 返回结果
  117 +
  118 +
  119 +
  120 + }
  121 +
  122 +
  123 +
  124 +
32 } 125 }
  1 +package com.yohoufo.order.service.support;
  2 +
  3 +import com.yohoufo.order.constants.OrderConstant;
  4 +import com.yohoufo.order.dal.model.SellerOrderGoods;
  5 +import com.yohoufo.order.response.ShoppingPaymentResponse;
  6 +import org.springframework.stereotype.Service;
  7 +
  8 +import java.math.BigDecimal;
  9 +import java.util.Arrays;
  10 +import java.util.List;
  11 +
  12 +@Service
  13 +public class ShoppingSupport {
  14 +
  15 +
  16 + /**
  17 + * 支付方式
  18 + * @return
  19 + */
  20 + public ShoppingPaymentResponse.PaymentWay getPaymentWay() {
  21 + // 支付方式: 在线支付
  22 + ShoppingPaymentResponse.PaymentWay paymentWay = new ShoppingPaymentResponse.PaymentWay();
  23 + paymentWay.setPaymentType(OrderConstant.PAYMENT_ONLINE);
  24 + paymentWay.setPaymentTypeName(OrderConstant.PAYMENT_ONLINE_NAME);
  25 + return paymentWay;
  26 + }
  27 +
  28 +
  29 + /**
  30 + * 配送方式
  31 + * @return
  32 + */
  33 + public ShoppingPaymentResponse.DeliveryWay getDeliverWay() {
  34 + // 快递方式
  35 + ShoppingPaymentResponse.DeliveryWay deliveryWay = new ShoppingPaymentResponse.DeliveryWay();
  36 + deliveryWay.setDeliveryWayId(OrderConstant.DELIVERY_WAY_SF);
  37 + deliveryWay.setDeliveryWayCost(OrderConstant.DELIVERY_WAY_SF_COST);
  38 + deliveryWay.setDeliveryWayName(OrderConstant.DELIVERY_WAY_SF_NAME);
  39 + return deliveryWay;
  40 + }
  41 +
  42 +
  43 + /**
  44 + * 商品情报
  45 + * @param skup
  46 + * @return
  47 + */
  48 + public ShoppingPaymentResponse.Goods getGoodsInfo(SellerOrderGoods skup) {
  49 + ShoppingPaymentResponse.Goods goods = new ShoppingPaymentResponse.Goods();
  50 + goods.setProductName(skup.getProductName());
  51 + goods.setColorId(skup.getColorId() == null ? 0 : skup.getColorId());
  52 + goods.setColor(skup.getColorName());
  53 + goods.setSizeId(skup.getSizeId() == null ? 0:skup.getSizeId());
  54 + goods.setSizeName(skup.getSizeName());
  55 + goods.setSalePrice(skup.getGoodsPrice());
  56 + goods.setGoodsImg(skup.getImageUrl());
  57 + return goods;
  58 + }
  59 +
  60 + /**
  61 + * 付款信息
  62 + * @param skup
  63 + * @return
  64 + */
  65 + public List<ShoppingPaymentResponse.PromotionFormula> getPromotionFormula(SellerOrderGoods skup) {
  66 + ShoppingPaymentResponse.PromotionFormula formula1 = new ShoppingPaymentResponse.PromotionFormula();
  67 + formula1.setPromotion(OrderConstant.GOODS_PRICE);
  68 + formula1.setPromotionAmount(OrderConstant.MONEY_SIGN + skup.getGoodsPrice());
  69 +
  70 + ShoppingPaymentResponse.PromotionFormula formula2 = new ShoppingPaymentResponse.PromotionFormula();
  71 + formula2.setPromotion(OrderConstant.DELIVERY_DESC);
  72 + formula2.setPromotionAmount(OrderConstant.PLUS_SIGN + OrderConstant.MONEY_SIGN + OrderConstant.DELIVERY_WAY_SF_COST);
  73 +
  74 + ShoppingPaymentResponse.PromotionFormula formula3 = new ShoppingPaymentResponse.PromotionFormula();
  75 + formula3.setPromotion(OrderConstant.GOODS_REAL_PRICE);
  76 + formula3.setPromotionAmount(OrderConstant.MONEY_SIGN + skup.getGoodsPrice().add(new BigDecimal(OrderConstant.DELIVERY_WAY_SF_COST)));
  77 +
  78 + return Arrays.asList(formula1, formula2, formula3);
  79 + }
  80 +
  81 +
  82 + /**
  83 + * 赔偿金文案
  84 + * @param damagedPrice
  85 + * @return
  86 + */
  87 + public String getDamagesDesc(BigDecimal damagedPrice){
  88 + StringBuilder damagesDesc = new StringBuilder();
  89 + damagesDesc.append(OrderConstant.DAMAGES_DESC);
  90 + damagesDesc.append(OrderConstant.MONEY_SIGN);
  91 + damagesDesc.append(damagedPrice);
  92 + damagesDesc.append(OrderConstant.MONEY_UNIT);
  93 + return damagesDesc.toString();
  94 +
  95 + }
  96 +}
  1 +package com.yohoufo.order.service.support.codegenerator;
  2 +
  3 +public interface OrderCodeGenerator {
  4 + /**
  5 + * 根据产生订单号
  6 + * @return
  7 + */
  8 + long generate();
  9 +
  10 +}
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> 2 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3 - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> 3 + <component name="FacetManager">
  4 + <facet type="Spring" name="Spring">
  5 + <configuration />
  6 + </facet>
  7 + </component>
  8 + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4 <output url="file://$MODULE_DIR$/target/classes" /> 9 <output url="file://$MODULE_DIR$/target/classes" />
5 <output-test url="file://$MODULE_DIR$/target/test-classes" /> 10 <output-test url="file://$MODULE_DIR$/target/test-classes" />
6 <content url="file://$MODULE_DIR$"> 11 <content url="file://$MODULE_DIR$">
@@ -10,10 +15,21 @@ @@ -10,10 +15,21 @@
10 </content> 15 </content>
11 <orderEntry type="inheritedJdk" /> 16 <orderEntry type="inheritedJdk" />
12 <orderEntry type="sourceFolder" forTests="false" /> 17 <orderEntry type="sourceFolder" forTests="false" />
13 - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />  
14 - <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />  
15 - <orderEntry type="module" module-name="yohoufo-fore-common" />  
16 <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.4-SNAPSHOT" level="project" /> 18 <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.4-SNAPSHOT" level="project" />
  19 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.4-SNAPSHOT" level="project" />
  20 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.4-SNAPSHOT" level="project" />
  21 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.4-SNAPSHOT" level="project" />
  22 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.4-SNAPSHOT" level="project" />
  23 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.4-SNAPSHOT" level="project" />
  24 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.4-SNAPSHOT" level="project" />
  25 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.4-SNAPSHOT" level="project" />
  26 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.4-SNAPSHOT" level="project" />
  27 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.4-SNAPSHOT" level="project" />
  28 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.4-SNAPSHOT" level="project" />
  29 + <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.4-SNAPSHOT" level="project" />
  30 + <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.4-SNAPSHOT" level="project" />
  31 + <orderEntry type="module" module-name="yohoufo-fore-common" />
  32 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.5-SNAPSHOT" level="project" />
17 <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" /> 33 <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" />
18 <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" /> 34 <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" />
19 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" /> 35 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" />
@@ -28,7 +44,7 @@ @@ -28,7 +44,7 @@
28 <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" /> 44 <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" />
29 <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" /> 45 <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" />
30 <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" /> 46 <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" />
31 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.4-SNAPSHOT" level="project" /> 47 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.5-SNAPSHOT" level="project" />
32 <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" /> 48 <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" />
33 <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" /> 49 <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
34 <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" /> 50 <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
@@ -37,22 +53,21 @@ @@ -37,22 +53,21 @@
37 <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" /> 53 <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
38 <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" /> 54 <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" />
39 <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" /> 55 <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" />
40 - <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.4-SNAPSHOT" level="project" /> 56 + <orderEntry type="module" module-name="error-code" />
41 <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" /> 57 <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" />
42 - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />  
43 <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" /> 58 <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" />
44 <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> 59 <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" />
45 <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> 60 <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" />
46 <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> 61 <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" />
47 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.4-SNAPSHOT" level="project" /> 62 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.5-SNAPSHOT" level="project" />
48 <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" /> 63 <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" />
49 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" /> 64 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
50 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" /> 65 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
51 <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" /> 66 <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" />
52 <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" /> 67 <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" />
53 <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" /> 68 <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" />
54 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.4-SNAPSHOT" level="project" />  
55 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.4-SNAPSHOT" level="project" /> 69 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.5-SNAPSHOT" level="project" />
  70 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.5-SNAPSHOT" level="project" />
56 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" /> 71 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" />
57 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" /> 72 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" />
58 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" /> 73 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" />
@@ -70,9 +85,9 @@ @@ -70,9 +85,9 @@
70 <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" /> 85 <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
71 <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" /> 86 <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
72 <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" /> 87 <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" />
73 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.4-SNAPSHOT" level="project" /> 88 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.5-SNAPSHOT" level="project" />
74 <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> 89 <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
75 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.4-SNAPSHOT" level="project" /> 90 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.5-SNAPSHOT" level="project" />
76 <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> 91 <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
77 <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> 92 <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
78 <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" /> 93 <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" />
@@ -82,13 +97,13 @@ @@ -82,13 +97,13 @@
82 <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" /> 97 <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" />
83 <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" /> 98 <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" />
84 <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" /> 99 <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" />
85 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.4-SNAPSHOT" level="project" />  
86 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.4-SNAPSHOT" level="project" />  
87 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.4-SNAPSHOT" level="project" /> 100 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.5-SNAPSHOT" level="project" />
  101 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.5-SNAPSHOT" level="project" />
  102 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.5-SNAPSHOT" level="project" />
88 <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" /> 103 <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" />
89 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" /> 104 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" />
90 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" /> 105 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" />
91 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.4-SNAPSHOT" level="project" /> 106 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.5-SNAPSHOT" level="project" />
92 <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" /> 107 <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" />
93 <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" /> 108 <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" />
94 <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" /> 109 <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" />
@@ -118,6 +133,7 @@ @@ -118,6 +133,7 @@
118 <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> 133 <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
119 <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" /> 134 <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" />
120 <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> 135 <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
  136 + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
121 <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> 137 <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
122 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" /> 138 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" />
123 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" /> 139 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" />
@@ -132,21 +148,29 @@ @@ -132,21 +148,29 @@
132 <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" /> 148 <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
133 <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> 149 <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
134 <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" /> 150 <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
135 - <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.4-SNAPSHOT" level="project" />  
136 - <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.4-SNAPSHOT" level="project" /> 151 + <orderEntry type="module" module-name="uic-service-model" />
  152 + <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.5-SNAPSHOT" level="project" />
137 <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" /> 153 <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" />
138 <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" /> 154 <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
139 <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> 155 <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
  156 + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
140 <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> 157 <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" />
141 <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" /> 158 <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" />
142 <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" /> 159 <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
143 - <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.4-SNAPSHOT" level="project" />  
144 - <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.4-SNAPSHOT" level="project" />  
145 - <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.4-SNAPSHOT" level="project" />  
146 - <orderEntry type="library" name="Maven: com.yoho.service.model:order-service-model:1.4.4-SNAPSHOT" level="project" /> 160 + <orderEntry type="module" module-name="resource-service-model" />
  161 + <orderEntry type="module" module-name="users-service-model" />
  162 + <orderEntry type="module" module-name="shops-service-model" />
  163 + <orderEntry type="module" module-name="order-service-model" />
147 <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" /> 164 <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" />
148 - <orderEntry type="library" name="Maven: com.yoho.service.model:product-service-model:1.4.4-SNAPSHOT" level="project" />  
149 - <orderEntry type="library" name="Maven: com.yoho.service.model:promotion-service-model:1.4.4-SNAPSHOT" level="project" /> 165 + <orderEntry type="module" module-name="product-service-model" />
  166 + <orderEntry type="module" module-name="promotion-service-model" />
150 <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" /> 167 <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
  168 + <orderEntry type="module" module-name="yohoufo-fore-dal" />
  169 + <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" />
  170 + <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
  171 + <orderEntry type="library" name="Maven: commons-pool:commons-pool:20030825.183949" level="project" />
  172 + <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
  173 + <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" />
  174 + <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" />
151 </component> 175 </component>
152 </module> 176 </module>
@@ -8,6 +8,7 @@ import com.yoho.core.common.utils.MD5; @@ -8,6 +8,7 @@ import com.yoho.core.common.utils.MD5;
8 import org.junit.Test; 8 import org.junit.Test;
9 9
10 10
  11 +import java.math.BigDecimal;
11 import java.util.Collections; 12 import java.util.Collections;
12 import java.util.Date; 13 import java.util.Date;
13 import java.util.List; 14 import java.util.List;
@@ -31,11 +32,14 @@ public class PayTest { @@ -31,11 +32,14 @@ public class PayTest {
31 data.put("msgType", "trade.precreate"); // 微信:wx.unifiedOrder, 支付宝:trade.precreate, 全民付：qmf.order, 银联云闪付:uac.appOrder 32 data.put("msgType", "trade.precreate"); // 微信:wx.unifiedOrder, 支付宝:trade.precreate, 全民付：qmf.order, 银联云闪付:uac.appOrder
32 data.put("requestTimestamp", DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss")); 33 data.put("requestTimestamp", DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
33 // 支付宝- 31945075157 34 // 支付宝- 31945075157
34 - data.put("merOrderId", "31945075157"); 35 + data.put("merOrderId", "31942222222222");
35 data.put("mid", "898310148160568"); //商户号 仅用于支付宝和云闪付 36 data.put("mid", "898310148160568"); //商户号 仅用于支付宝和云闪付
36 data.put("tid","00000001"); //终端号 37 data.put("tid","00000001"); //终端号
37 data.put("instMid", "APPDEFAULT"); // 机构商户号 38 data.put("instMid", "APPDEFAULT"); // 机构商户号
38 data.put("totalAmount", 1); 39 data.put("totalAmount", 1);
  40 + // 回调接口 http://api-test3.dev.yohocorp.com/payment/weixin_notify
  41 + data.put("notifyUrl", "http://testapi.yohops.com/payment/weixin_notify");
  42 +
39 43
40 44
41 data.put("sign", getSign(data)); 45 data.put("sign", getSign(data));
@@ -126,19 +130,25 @@ public class PayTest { @@ -126,19 +130,25 @@ public class PayTest {
126 * 订单查询接口 130 * 订单查询接口
127 */ 131 */
128 @Test 132 @Test
129 - public void testQuary(){ 133 + public void testQuary() throws Exception{
130 134
131 JSONObject data = new JSONObject(); 135 JSONObject data = new JSONObject();
132 data.put("msgSrc","WWW.TEST.COM"); 136 data.put("msgSrc","WWW.TEST.COM");
133 // 支付宝 137 // 支付宝
134 data.put("msgType", "query"); // 微信:wx.unifiedOrder, 支付宝:trade.precreate, 全民付：qmf.order, 银联云闪付:uac.appOrder 138 data.put("msgType", "query"); // 微信:wx.unifiedOrder, 支付宝:trade.precreate, 全民付：qmf.order, 银联云闪付:uac.appOrder
135 data.put("requestTimestamp", DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss")); 139 data.put("requestTimestamp", DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
136 - data.put("merOrderId", "24455075157"); 140 + data.put("merOrderId", "319450751581111111");
137 data.put("mid", "898310148160568"); //商户号 仅用于支付宝和云闪付 141 data.put("mid", "898310148160568"); //商户号 仅用于支付宝和云闪付
138 data.put("tid","00000001"); //终端号 142 data.put("tid","00000001"); //终端号
139 data.put("instMid", "APPDEFAULT"); // 机构商户号 143 data.put("instMid", "APPDEFAULT"); // 机构商户号
140 144
  145 +
141 data.put("sign", getSign(data)); 146 data.put("sign", getSign(data));
  147 +
  148 + HttpClient httpClient = new HttpClient();
  149 + httpClient.init();
  150 + String result = httpClient.post(url, JSON.toJSONString(data));
  151 + System.out.println(result);
142 } 152 }
143 153
144 154
@@ -146,20 +156,25 @@ public class PayTest { @@ -146,20 +156,25 @@ public class PayTest {
146 * 订单退款 156 * 订单退款
147 */ 157 */
148 @Test 158 @Test
149 - public void testRefund(){ 159 + public void testRefund()throws Exception{
150 160
151 JSONObject data = new JSONObject(); 161 JSONObject data = new JSONObject();
152 data.put("msgSrc","WWW.TEST.COM"); 162 data.put("msgSrc","WWW.TEST.COM");
153 // 支付宝 163 // 支付宝
154 data.put("msgType", "refund"); // 微信:wx.unifiedOrder, 支付宝:trade.precreate, 全民付：qmf.order, 银联云闪付:uac.appOrder 164 data.put("msgType", "refund"); // 微信:wx.unifiedOrder, 支付宝:trade.precreate, 全民付：qmf.order, 银联云闪付:uac.appOrder
155 data.put("requestTimestamp", DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss")); 165 data.put("requestTimestamp", DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
156 - data.put("merOrderId", "24455075157"); 166 + data.put("merOrderId", "319450751589999");
157 data.put("mid", "898310148160568"); //商户号 仅用于支付宝和云闪付 167 data.put("mid", "898310148160568"); //商户号 仅用于支付宝和云闪付
158 data.put("tid","00000001"); //终端号 168 data.put("tid","00000001"); //终端号
159 data.put("instMid", "APPDEFAULT"); // 机构商户号 169 data.put("instMid", "APPDEFAULT"); // 机构商户号
160 data.put("refundAmount",1); 170 data.put("refundAmount",1);
161 171
162 data.put("sign", getSign(data)); 172 data.put("sign", getSign(data));
  173 +
  174 + HttpClient httpClient = new HttpClient();
  175 + httpClient.init();
  176 + String result = httpClient.post(url, JSON.toJSONString(data));
  177 + System.out.println(result);
163 } 178 }
164 179
165 /** 180 /**
@@ -184,4 +199,13 @@ public class PayTest { @@ -184,4 +199,13 @@ public class PayTest {
184 199
185 // 回调接口 200 // 回调接口
186 201
  202 +
  203 + @Test
  204 + public void tes(){
  205 +
  206 + BigDecimal bigDecimal = new BigDecimal("22.88");
  207 + System.out.println(bigDecimal);
  208 +
  209 + }
  210 +
187 } 211 }
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> 2 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3 - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> 3 + <component name="FacetManager">
  4 + <facet type="Spring" name="Spring">
  5 + <configuration />
  6 + </facet>
  7 + </component>
  8 + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4 <output url="file://$MODULE_DIR$/target/classes" /> 9 <output url="file://$MODULE_DIR$/target/classes" />
5 <output-test url="file://$MODULE_DIR$/target/test-classes" /> 10 <output-test url="file://$MODULE_DIR$/target/test-classes" />
6 <content url="file://$MODULE_DIR$"> 11 <content url="file://$MODULE_DIR$">
7 <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> 12 <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
  13 + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8 <excludeFolder url="file://$MODULE_DIR$/target" /> 14 <excludeFolder url="file://$MODULE_DIR$/target" />
9 </content> 15 </content>
10 <orderEntry type="inheritedJdk" /> 16 <orderEntry type="inheritedJdk" />
11 <orderEntry type="sourceFolder" forTests="false" /> 17 <orderEntry type="sourceFolder" forTests="false" />
12 - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />  
13 - <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />  
14 - <orderEntry type="module" module-name="yohoufo-fore-common" />  
15 <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.4-SNAPSHOT" level="project" /> 18 <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.4-SNAPSHOT" level="project" />
  19 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.4-SNAPSHOT" level="project" />
  20 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.4-SNAPSHOT" level="project" />
  21 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.4-SNAPSHOT" level="project" />
  22 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.4-SNAPSHOT" level="project" />
  23 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.4-SNAPSHOT" level="project" />
  24 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.4-SNAPSHOT" level="project" />
  25 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.4-SNAPSHOT" level="project" />
  26 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.4-SNAPSHOT" level="project" />
  27 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.4-SNAPSHOT" level="project" />
  28 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.4-SNAPSHOT" level="project" />
  29 + <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.4-SNAPSHOT" level="project" />
  30 + <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.4-SNAPSHOT" level="project" />
  31 + <orderEntry type="module" module-name="yohoufo-fore-common" />
  32 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.5-SNAPSHOT" level="project" />
16 <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" /> 33 <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" />
17 <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" /> 34 <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" />
18 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" /> 35 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" />
@@ -27,32 +44,29 @@ @@ -27,32 +44,29 @@
27 <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" /> 44 <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" />
28 <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" /> 45 <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" />
29 <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" /> 46 <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" />
30 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.4-SNAPSHOT" level="project" /> 47 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.5-SNAPSHOT" level="project" />
31 <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" /> 48 <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" />
32 <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" /> 49 <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
33 <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" /> 50 <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
34 - <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />  
35 - <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />  
36 <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" /> 51 <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
37 <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" /> 52 <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" />
38 <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" /> 53 <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" />
39 - <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.4-SNAPSHOT" level="project" /> 54 + <orderEntry type="module" module-name="error-code" />
40 <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" /> 55 <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" />
41 - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />  
42 <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" /> 56 <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" />
43 <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> 57 <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" />
44 <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" /> 58 <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" />
45 <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> 59 <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" />
46 <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> 60 <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" />
47 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.4-SNAPSHOT" level="project" /> 61 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.5-SNAPSHOT" level="project" />
48 <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" /> 62 <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" />
49 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" /> 63 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
50 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" /> 64 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
51 <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" /> 65 <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" />
52 <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" /> 66 <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" />
53 <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" /> 67 <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" />
54 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.4-SNAPSHOT" level="project" />  
55 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.4-SNAPSHOT" level="project" /> 68 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.5-SNAPSHOT" level="project" />
  69 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.5-SNAPSHOT" level="project" />
56 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" /> 70 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" />
57 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" /> 71 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" />
58 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" /> 72 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" />
@@ -70,9 +84,9 @@ @@ -70,9 +84,9 @@
70 <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" /> 84 <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
71 <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" /> 85 <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
72 <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" /> 86 <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" />
73 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.4-SNAPSHOT" level="project" /> 87 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.5-SNAPSHOT" level="project" />
74 <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> 88 <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
75 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.4-SNAPSHOT" level="project" /> 89 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.5-SNAPSHOT" level="project" />
76 <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> 90 <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
77 <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> 91 <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
78 <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" /> 92 <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" />
@@ -82,13 +96,13 @@ @@ -82,13 +96,13 @@
82 <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" /> 96 <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" />
83 <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" /> 97 <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" />
84 <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" /> 98 <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" />
85 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.4-SNAPSHOT" level="project" />  
86 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.4-SNAPSHOT" level="project" />  
87 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.4-SNAPSHOT" level="project" /> 99 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.5-SNAPSHOT" level="project" />
  100 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.5-SNAPSHOT" level="project" />
  101 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.5-SNAPSHOT" level="project" />
88 <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" /> 102 <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" />
89 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" /> 103 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" />
90 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" /> 104 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" />
91 - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.4-SNAPSHOT" level="project" /> 105 + <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.5-SNAPSHOT" level="project" />
92 <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" /> 106 <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" />
93 <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" /> 107 <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" />
94 <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" /> 108 <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" />
@@ -118,6 +132,7 @@ @@ -118,6 +132,7 @@
118 <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> 132 <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
119 <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" /> 133 <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" />
120 <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> 134 <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
  135 + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
121 <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> 136 <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
122 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" /> 137 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" />
123 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" /> 138 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" />
@@ -132,21 +147,31 @@ @@ -132,21 +147,31 @@
132 <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" /> 147 <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
133 <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> 148 <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
134 <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" /> 149 <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
135 - <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.4-SNAPSHOT" level="project" />  
136 - <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.4-SNAPSHOT" level="project" /> 150 + <orderEntry type="module" module-name="uic-service-model" />
  151 + <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.5-SNAPSHOT" level="project" />
137 <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" /> 152 <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" />
138 <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" /> 153 <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
139 <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> 154 <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
  155 + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
140 <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> 156 <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" />
141 <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" /> 157 <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" />
142 <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" /> 158 <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
143 - <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.4-SNAPSHOT" level="project" />  
144 - <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.4-SNAPSHOT" level="project" />  
145 - <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.4-SNAPSHOT" level="project" /> 159 + <orderEntry type="module" module-name="resource-service-model" />
  160 + <orderEntry type="module" module-name="users-service-model" />
  161 + <orderEntry type="module" module-name="shops-service-model" />
146 <orderEntry type="module" module-name="yohoufo-fore-order" /> 162 <orderEntry type="module" module-name="yohoufo-fore-order" />
147 - <orderEntry type="library" name="Maven: com.yoho.service.model:order-service-model:1.4.4-SNAPSHOT" level="project" />  
148 - <orderEntry type="library" name="Maven: com.yoho.service.model:product-service-model:1.4.4-SNAPSHOT" level="project" />  
149 - <orderEntry type="library" name="Maven: com.yoho.service.model:promotion-service-model:1.4.4-SNAPSHOT" level="project" /> 163 + <orderEntry type="module" module-name="order-service-model" />
  164 + <orderEntry type="module" module-name="product-service-model" />
  165 + <orderEntry type="module" module-name="promotion-service-model" />
  166 + <orderEntry type="module" module-name="yohoufo-fore-dal" />
  167 + <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" />
  168 + <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
  169 + <orderEntry type="library" name="Maven: commons-pool:commons-pool:20030825.183949" level="project" />
  170 + <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
  171 + <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" />
  172 + <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" />
150 <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" /> 173 <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
  174 + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
  175 + <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
151 </component> 176 </component>
152 </module> 177 </module>