Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

iamberry-common-config/iamberry-common-config.iml

@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
-    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.12" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.12" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
-    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
-    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
-    <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
-    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
-    <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
-    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
-    <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
-    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
-    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
-    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
-  </component>
-</module>

iamberry-common-core/iamberry-common-core.iml

@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="iamberry-common-tool" />
-    <orderEntry type="module" module-name="iamberry-common-config" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
-    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.12" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.12" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
-    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
-    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
-    <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
-    <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
-    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
-    <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
-    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
-    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
-    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
-    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
-    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
-  </component>
-</module>

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/CartDto.java

@@ -42,9 +42,18 @@ public class CartDto implements Serializable{
 	private String productRemark; //商品备注
 	
 	private String productColor;			//产品颜色		不再用代码表示，直接使用汉字- 1：红色	2：橙色	3：黄色	4：绿色 5：青色	6：蓝色	7：紫色	8：白色
-	
 
-	
+	private Integer cartColorId;//产品颜色id
+	private List<SalesUserGift> salesUserGiftList; //赠品集合
+
+	public Integer getCartColorId() {
+		return cartColorId;
+	}
+
+	public void setCartColorId(Integer cartColorId) {
+		this.cartColorId = cartColorId;
+	}
+
 	public Integer getProductType() {
 		return productType;
 	}
@@ -157,6 +166,12 @@ public class CartDto implements Serializable{
 	public void setProductIntroduceImg(String productIntroduceImg) {
 		this.productIntroduceImg = productIntroduceImg;
 	}
-	
-	
+
+	public List<SalesUserGift> getSalesUserGiftList() {
+		return salesUserGiftList;
+	}
+
+	public void setSalesUserGiftList(List<SalesUserGift> salesUserGiftList) {
+		this.salesUserGiftList = salesUserGiftList;
+	}
 }

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/member/Member.java

@@ -47,7 +47,16 @@ public class Member implements Serializable{
 	private Integer templateId;				//返利模板id
 	private Integer userDealers;			//代理商层级id
 	private Page page;						//分页
-	
+	private String phoneCode;				//手机验证码
+
+	public String getPhoneCode() {
+		return phoneCode;
+	}
+
+	public void setPhoneCode(String phoneCode) {
+		this.phoneCode = phoneCode;
+	}
+
 	public Page getPage() {
 		return page;
 	}

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/order/OrderItem.java

@@ -41,10 +41,44 @@ public class OrderItem implements Serializable {
 	//			5：青色	6：蓝色	7：紫色	8：白色
 	
 	private String produectRemark;		//产品备注，存放百胜商品69码的
-	
-	
-	
-	
+
+	private Integer itemColorId;			//产品颜色id
+	private String itemProductColor;		//产品颜色
+	private Integer itemProductChildType;	//产品子类型
+	private Integer itemIsSource;			//产品来源
+
+	public Integer getItemColorId() {
+		return itemColorId;
+	}
+
+	public void setItemColorId(Integer itemColorId) {
+		this.itemColorId = itemColorId;
+	}
+
+	public String getItemProductColor() {
+		return itemProductColor;
+	}
+
+	public void setItemProductColor(String itemProductColor) {
+		this.itemProductColor = itemProductColor;
+	}
+
+	public Integer getItemProductChildType() {
+		return itemProductChildType;
+	}
+
+	public void setItemProductChildType(Integer itemProductChildType) {
+		this.itemProductChildType = itemProductChildType;
+	}
+
+	public Integer getItemIsSource() {
+		return itemIsSource;
+	}
+
+	public void setItemIsSource(Integer itemIsSource) {
+		this.itemIsSource = itemIsSource;
+	}
+
 	public Integer getItemProductType() {
 		return itemProductType;
 	}

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/product/SalesUserGift.java

@@ -17,6 +17,7 @@ public class SalesUserGift implements java.io.Serializable {
     private Integer userGiftCount;      //赠送产品数量
     private Integer userStatus;         //状态    1:使用，2：停用
     private Date userCreateTime;        //创建时间
+    private String productName;        //产品名称
 
     public Integer getUserId() {
         return userId;
@@ -81,4 +82,12 @@ public class SalesUserGift implements java.io.Serializable {
     public void setUserCreateTime(Date userCreateTime) {
         this.userCreateTime = userCreateTime;
     }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
 }

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/warrantyCard/WarrantyCard.java

@@ -12,6 +12,7 @@ public class WarrantyCard implements java.io.Serializable {
 
     private Integer cardId;             //id
     private String userOpenId;          //openId
+    private Integer productType;        //产品类型id
     private Integer productChildType;   //产品子类型id
     private String cardNo;              //编号
     private String cardProductName;     //产品名称
@@ -24,6 +25,14 @@ public class WarrantyCard implements java.io.Serializable {
     private String cardDistrict;        //区
     private Integer cardTypeState;      //状态 1：使用中，2：停用
 
+    public Integer getProductType() {
+        return productType;
+    }
+
+    public void setProductType(Integer productType) {
+        this.productType = productType;
+    }
+
     public Integer getCardId() {
         return cardId;
     }

iamberry-common-interface/iamberry-common-interface.iml

@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="iamberry-common-core" />
-    <orderEntry type="module" module-name="iamberry-common-tool" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
-    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.12" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.12" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
-    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
-    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
-    <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
-    <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
-    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
-    <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
-    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
-    <orderEntry type="module" module-name="iamberry-common-config" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
-    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
-    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
-    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
-    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
-  </component>
-</module>

iamberry-wechat-interface/iamberry-wechat-interface.iml

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="iamberry-common-core" />
-    <orderEntry type="module" module-name="iamberry-common-tool" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
-    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.12" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.12" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
-    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
-    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
-    <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
-    <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
-    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
-    <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
-    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
-    <orderEntry type="module" module-name="iamberry-common-config" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
-    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
-    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
-    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
-    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
-  </component>
-</module>

iamberry-wechat-interface/src/main/java/com/iamberry/wechat/face/cart/ProductInfoService.java

@@ -3,6 +3,7 @@ package com.iamberry.wechat.face.cart;
 import java.util.List;
 
 import com.iamberry.wechat.core.entity.product.Product;
+import com.iamberry.wechat.core.entity.product.ProductColor;
 
 public interface ProductInfoService {
 
@@ -34,4 +35,11 @@ public interface ProductInfoService {
 	 * @return
 	 */
 	public Integer updateProductNumList(String orderId);
+
+	/**
+	 * 获取产品颜色信息
+	 * @param productColor
+	 * @return
+	 */
+	ProductColor getProductColor(ProductColor productColor);
 }

iamberry-wechat-interface/src/main/java/com/iamberry/wechat/face/mq/EfastOrderService.java

@@ -74,4 +74,12 @@ public interface EfastOrderService {
 	 * @throws Exception
 	 */
 	public boolean exchangeOrderInfoToEfast(MQMessage message) throws Exception;
+
+	/**
+	 * 获取百胜订单信息
+	 * @param orderid
+	 * @return
+	 * @throws Exception
+	 */
+	JSONObject getOrderFormEfast(String orderid) throws Exception;
 }

iamberry-wechat-interface/src/main/java/com/iamberry/wechat/face/phone/PhoneCodeService.java

@@ -0,0 +1,18 @@
+package com.iamberry.wechat.face.phone;
+
+import com.iamberry.wechat.tools.ResponseJson;
+
+/**
+ * 手机短信接口
+ * Created by liuzhiwei on 2017/12/20.
+ */
+public interface PhoneCodeService {
+
+    /**
+     * 根据手机号码、短信验证码、校验是否正确
+     * @param phone
+     * @param code
+     * @return
+     */
+    public ResponseJson validCode(String phone, String code);
+}

iamberry-wechat-interface/src/main/java/com/iamberry/wechat/face/warranty/WarrantyService.java

@@ -0,0 +1,17 @@
+package com.iamberry.wechat.face.warranty;
+
+import com.iamberry.wechat.core.entity.member.Member;
+
+/**
+ * Created by liuzhiwei on 2017/12/21.
+ */
+public interface WarrantyService {
+
+    /**
+     * 批量添加质保卡信息
+     * @param txtOrderId
+     * @return
+     */
+    boolean addWarrantyList(String txtOrderId, Member member, String cardWatero,
+                            String cardProvince, String cardCity, String cardDistrict) throws Exception;
+}

iamberry-wechat-service/iamberry-wechat-service.iml

@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="iamberry-wechat-interface" />
-    <orderEntry type="module" module-name="iamberry-common-core" />
-    <orderEntry type="module" module-name="iamberry-common-tool" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
-    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.12" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.12" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
-    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
-    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
-    <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
-    <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
-    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
-    <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
-    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
-    <orderEntry type="module" module-name="iamberry-common-config" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.1.BUILD-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.1.BUILD-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.1.BUILD-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
-    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
-    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
-    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
-  </component>
-</module>

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/cart/ProductInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.iamberry.wechat.service.cart;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.iamberry.wechat.core.entity.product.ProductColor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -80,5 +81,8 @@ public class ProductInfoServiceImpl implements ProductInfoService {
 		return productInfoDao.updateProductNumList(orderItemList);
 	}
 
-	
+	@Override
+	public ProductColor getProductColor(ProductColor productColor) {
+		return productInfoDao.getProductColor(productColor);
+	}
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/ProductInfoDao.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.iamberry.wechat.core.entity.PaperBean;
 import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
 import com.iamberry.wechat.core.entity.product.Product;
+import com.iamberry.wechat.core.entity.product.ProductColor;
 
 public interface ProductInfoDao {
 
@@ -31,4 +32,11 @@ public interface ProductInfoDao {
 	 * @return
 	 */
 	public Integer updateProductNumList(List<ShopOrderItemDto> orderItemList);
+
+	/**
+	 * 获取产品颜色信息
+	 * @param productColor
+	 * @return
+	 */
+	ProductColor getProductColor(ProductColor productColor);
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/impl/ProductInfoDaoImpl.java

@@ -2,6 +2,7 @@ package com.iamberry.wechat.service.cart.dao.impl;
 
 import java.util.List;
 
+import com.iamberry.wechat.core.entity.product.ProductColor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -52,6 +53,9 @@ public class ProductInfoDaoImpl implements ProductInfoDao {
 		// TODO Auto-generated method stub
 		return productInfoMapper.updateProductNumList(orderItemList);
 	}
-	
 
+	@Override
+	public ProductColor getProductColor(ProductColor productColor) {
+		return productInfoMapper.getProductColor(productColor);
+	}
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/PhoneCodeMapper.java

@@ -0,0 +1,16 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.phone.PhoneCode;
+
+/**
+ * Created by liuzhiwei on 2017/12/20.
+ */
+public interface PhoneCodeMapper {
+
+    /**
+     * 获取单条手机验证码信息
+     * @param phoneCode
+     * @return
+     */
+    public PhoneCode getPhoneCode(PhoneCode phoneCode);
+}

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/ProductInfoMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 import com.iamberry.wechat.core.entity.PaperBean;
 import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
 import com.iamberry.wechat.core.entity.product.Product;
+import com.iamberry.wechat.core.entity.product.ProductColor;
 
 public interface ProductInfoMapper {
 	
@@ -30,4 +31,11 @@ public interface ProductInfoMapper {
 	 * @return
 	 */
 	public Integer updateProductNumList(List<ShopOrderItemDto> orderItemList);
+
+	/**
+	 * 获取产品颜色信息
+	 * @param productColor
+	 * @return
+	 */
+	ProductColor getProductColor(ProductColor productColor);
 }

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/WarrantyMapper.java

@@ -0,0 +1,25 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.warrantyCard.WarrantyCard;
+
+import java.util.List;
+
+/**
+ * Created by liuzhiwei on 2017/12/21.
+ */
+public interface WarrantyMapper {
+
+    /**
+     * 查询质保卡集合
+     * @param warrantyCard
+     * @return
+     */
+    List<WarrantyCard> listWarrantyCard(WarrantyCard warrantyCard);
+
+    /**
+     * 批量添加质保卡信息
+     * @param list
+     * @return
+     */
+    Integer addWarrantyCardList(List<WarrantyCard> list);
+}

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/cartMapper.xml

@@ -7,12 +7,45 @@ PUBLIC
 	namespace:必须与对应的接口全类名一致
  -->
 <mapper namespace="com.iamberry.wechat.service.mapper.CartMapper">
+	<resultMap id="cartMap" type="CartDto">
+		<id column="cart_id" property="cartId"/>
+		<result column="CART_PRODUCT_ID" property="cartProductId"/>
+		<result column="CART_NUM" property="cartNum"/>
+		<result column="PRODUCT_NAME" property="productName"/>
+		<result column="color_discount" property="productPrice"/>
+		<result column="PRODUCT_STATUS" property="productStatus"/>
+		<result column="color_name" property="productColor"/>
+		<result column="color_product_pic" property="productIntroduceImg"/>
+		<result column="PRODUCT_REMARK" property="productRemark"/>
+		<result column="color_id" property="colorId"/>
+		<collection property="salesUserGiftList" column="color_id" ofType="SalesUserGift" select="listGift"/>
+	</resultMap>
+
+	<select id="listGift" resultType="salesUserGiftList" parameterType="Integer">
+		SELECT
+			ug.user_id userId,
+			ug.user_product_id userProductId,
+			ug.user_color_id userColorId,
+			ug.user_gift_id userGiftId,
+			ug.user_gift_color userGiftColor,
+			ug.user_gift_count userGiftCount,
+			ug.user_status userStatus,
+			ug.user_status userCreateTime,
+			pi.product_name productName
+		FROM
+			tb_iamberry_sales_user_gift ug
+		LEFT JOIN tb_iamberry_product_color pc on pc.color_id = 1
+		LEFT JOIN tb_iamberry_product_info pi on pi.product_id = pc.color_product_id
+		WHERE
+			ug.user_color_id = 1
+	</select>
+
 	<!-- 查询用户购物车所有信息 -->
-	<select id="selectCartByOpenId" parameterType="String" resultType="CartDto">
+	<select id="selectCartByOpenId" parameterType="String" resultMap="cartMap">
 		SELECT 
 			C.CART_ID cartId, C.CART_PRODUCT_ID cartProductId, C.CART_NUM cartNum,P.PRODUCT_NAME productName,
 			pc.color_discount productPrice, P.PRODUCT_STATUS productStatus, pc.color_name productColor,
-			pc.color_product_pic productIntroduceImg, PRODUCT_REMARK productRemark
+			pc.color_product_pic productIntroduceImg, PRODUCT_REMARK productRemark,pc.color_id colorId
 		FROM 
 			TB_IAMBERRY_SHOP_CART C
 			LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P ON C.CART_PRODUCT_ID = P.PRODUCT_ID
@@ -21,7 +54,9 @@ PUBLIC
 			C.CART_OPENID = #{openId} 
 		ORDER BY C.CART_ID DESC 
 	</select>
-	
+
+
+
 	<select id="getCartNumByCartOpenId" parameterType="String" resultType="Integer">
 		SELECT 
 			COUNT(C.CART_ID) 
@@ -212,23 +247,21 @@ PUBLIC
 	
 	<!-- 根据购物车ID数组，批量获取购物车集合 -->
 	<select id="selectCartItemByListId" parameterType="java.util.List" resultType="CartDto">
-		SELECT 
-			C.CART_ID cartId, G.PRODUCT_ID cartProductId, G.PRODUCT_STATUS productStatus,
-			C.CART_NUM cartNum, G.PRODUCT_NAME productName, G.PRODUCT_DISCOUNT productPrice,
-			G.PRODUCT_INTRODUCE_IMG productIntroduceImg, G.PRODUCT_DISCOUNT productDiscount, G.PRODUCT_REMARK productRemark, 
-			G.PRODUCT_COLOR productColor, G.PRODUCT_TYPE productType 
-		FROM 
-			TB_IAMBERRY_SHOP_CART C 
-		LEFT JOIN 
-			TB_IAMBERRY_PRODUCT_INFO G 
-		ON 
-			C.CART_PRODUCT_ID = G.PRODUCT_ID
+		SELECT
+			C.CART_ID cartId, G.PRODUCT_ID cartProductId, pc.COLOR_ID cartColorId, G.PRODUCT_STATUS productStatus,
+			C.CART_NUM cartNum, G.PRODUCT_NAME productName, pc.COLOR_DISCOUNT productPrice,
+			G.PRODUCT_INTRODUCE_IMG productIntroduceImg, pc.COLOR_PRICE productDiscount, PC.COLOR_69CODE productRemark,
+			pc.COLOR_NAME productColor, G.PRODUCT_TYPE productType
+		FROM
+			TB_IAMBERRY_SHOP_CART C
+		LEFT JOIN TB_IAMBERRY_PRODUCT_INFO G ON C.CART_PRODUCT_ID = G.PRODUCT_ID
+		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR PC ON C.CART_COLOR_ID = PC.COLOR_ID
 		WHERE
 			C.CART_ID IN (
-				<foreach collection="array" item="item" separator=",">
-					#{item} 
-		        </foreach>) 
-		 ORDER BY C.CART_ID DESC
+			<foreach collection="array" item="item" separator=",">
+				#{item}
+			</foreach>)
+		ORDER BY C.CART_ID DESC
 	</select>
 	
 	<!-- 根据orderId查询订单状态，openid和发货时间 -->

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/phoneCodeMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.wechat.service.mapper.PhoneCodeMapper">
+
+    <!-- 获取单条手机验证码信息 -->
+    <select id="getPhoneCode" parameterType="PhoneCode" resultType="PhoneCode">
+      SELECT
+        *
+      FROM
+        tb_iamberry_phone_code
+      WHERE
+        code_tel = #{codeTel}
+    </select>
+</mapper>

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/productInfoMapper.xml

@@ -139,4 +139,22 @@
 			PRODUCT_ID = #{item.itemProductId,jdbcType=INTEGER}
 			</foreach>
 	</update>
+
+	<!-- 获取产品颜色信息 -->
+	<select id="getProductColor" parameterType="ProductColor" resultType="ProductColor">
+		SELECT
+		  c.*,
+		  ct.type_id colorProductType,
+		  ct.child_type_id productChildType,
+		  p.product_name colorProductName
+		FROM
+		  tb_iamberry_product_color c
+		LEFT JOIN tb_iamberry_product_info p ON c.color_product_id = p.product_id
+		LEFT JOIN tb_iamberry_product_child_type ct ON p.product_child_type = ct.child_type_id
+		<where>
+			<if test="color69Code != null and color69Code != ''">
+				color_69code = #{color69Code}
+			</if>
+		</where>
+	</select>
 </mapper>

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/warrantyMapper.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.wechat.service.mapper.WarrantyMapper">
+
+    <!-- 查询质保卡集合 -->
+    <select id="listWarrantyCard" parameterType="WarrantyCard" resultType="WarrantyCard">
+        SELECT
+          *
+        FROM
+          tb_iamberry_warranty_card
+        <where>
+            <if test="userOpenId != null and userOpenId != ''">
+                user_open_id = #{userOpenId}
+            </if>
+            <if test="cardSalesTime != null">
+                AND card_sales_time = #{cardSalesTime}
+            </if>
+        </where>
+    </select>
+
+    <!-- 批量添加质保卡信息 -->
+    <insert id="addWarrantyCardList" parameterType="ArrayList">
+        <selectKey resultType="int" keyProperty="cardId" order="AFTER">
+            SELECT
+            LAST_INSERT_ID()
+        </selectKey>
+        INSERT INTO tb_iamberry_warranty_card
+        (
+        user_open_id,product_type,product_child_type,card_no,card_product_name,
+        card_watero,card_sales_time,card_end_time,card_create_date,card_province,
+        card_city,card_district,card_type_state
+        )
+        VALUES
+        <foreach collection="list" item="item" index="index" separator="," >
+            (
+            #{item.userOpenId},#{item.productType},#{item.productChildType},#{item.cardNo},
+            #{item.cardProductName},#{item.cardWatero},#{item.cardSalesTime},#{item.cardEndTime},
+            #{item.cardCreateDate},#{item.cardProvince},#{item.cardCity},#{item.cardDistrict},
+            #{item.cardTypeState}
+            )
+        </foreach>
+    </insert>
+</mapper>

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mq/EfastOrderServiceImpl.java

@@ -11,6 +11,7 @@ import java.util.regex.Pattern;
 import net.sf.json.JSONObject;
 
 import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -614,6 +615,43 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 				}
 				return null;
 	}
+
+	@Override
+	public JSONObject getOrderFormEfast(String orderid) throws Exception {
+		if(StringUtils.isEmpty(orderid)) return null;
+		Map<String, String> requestData = new HashMap<String, String>();
+		requestData.put("app_nick", NameUtils.app_nick);
+		requestData.put("app_key", NameUtils.app_key);
+		requestData.put("app_secret", NameUtils.app_secret);
+		requestData.put("timestamp", DateTimeUtil.format(new Date(),"yyyyMMddHHmmss"));
+		requestData.put("app_act", "efast.trade.detail.get");
+
+		requestData.put("oid", orderid);
+		requestData.put("feilds",NameUtils.order_field);   //1.order_status 订单状态:0(未确认)1(确认)2(挂起)3(作废)     2.shipping_status发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
+
+		try {
+			String result = HttpClient431Util.doGet(requestData, NameUtils.efast_base_url);
+			result = StringEscapeUtils.unescapeJava(result); // unicode 编码
+			Pattern p = Pattern.compile("\\s*|\t|\r|\n");
+			Matcher m = p.matcher(result);
+			if (m.find()) {
+				result = m.replaceAll("");
+			}
+			logger.info("rst-推送百胜订单号-->>" + orderid + "，百胜返回信息-->" + result);
+			// parse JSON String to Object
+			JSONObject jsonObject = JSONObject.fromObject(result);
+			JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
+			if (respData != null) {
+				return respData;
+			} else {
+				logger.error(this,"rst-获取百胜出错，订单号-->>" + orderid + "，百胜返回信息-->" + result);
+				throw new Exception(respData.getString("msg"));
+			}
+		} catch (Exception e) {
+			logger.error(this,"rst-获取百胜出错，订单号-->>" + orderid + "，catch");
+			throw e;
+		}
+	}
 	
 	//修改物流的快递代码,修改成百盛那边可以接收的快递代码
 	public String getExpressCode(String code) {

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/phone/PhoneCodeServiceImpl.java

@@ -0,0 +1,173 @@
+package com.iamberry.wechat.service.phone;
+
+import com.iamberry.app.config.ImberryConfig;
+import com.iamberry.app.tool.log.RatFWLogger;
+import com.iamberry.wechat.core.entity.phone.PhoneCode;
+import com.iamberry.wechat.face.phone.PhoneCodeService;
+import com.iamberry.wechat.service.mapper.PhoneCodeMapper;
+import com.iamberry.wechat.tools.ResponseJson;
+import net.sf.json.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.MessageFormat;
+import java.util.*;
+
+/**
+ * 手机短信业务
+ * Created by liuzhiwei on 2017/12/20.
+ */
+@Service
+public class PhoneCodeServiceImpl implements PhoneCodeService {
+
+    @Autowired
+    private RatFWLogger logger;
+    @Autowired
+    private PhoneCodeMapper phoneCodeMapper;
+
+    private static String ENCODING = "UTF-8";
+    private static Random rnd = new Random();
+
+    /**
+     * 发送短信验证码 封装返回前台参数
+     * @param phone		手机号码
+     * @param code		短信验证码
+     * @return
+     */
+    private ResponseJson sendCMS(String phone, String code) {
+        ResponseJson json = new ResponseJson();
+        json.setReturnCode(500);
+        String result = null;
+        try {
+            String text = MessageFormat.format(ImberryConfig.INTER_SMS_TEXT, code);
+            result = sendOtherCMS(phone, text);
+        } catch (Exception e) {
+            logger.info(PhoneCodeServiceImpl.class, e.getMessage());
+            result = "验证码发送失败，请稍后重试";
+        }
+        if (StringUtils.equals(result, "SUCCESS")) {
+            json.setReturnCode(200);
+        }
+        json.addResponseKeyValue(result);
+        return json;
+    }
+
+    /**
+     * 向指定手机发送短信 返回发送结果
+     * @param phone	电话
+     * @param text	短信内容
+     * @return
+     */
+    private String sendOtherCMS(String phone, String text) {
+        String results = sendSms(text,phone);
+        logger.info("向手机：" + phone + ",发送短信：" + text + ",返回结果-->>" + results);
+        JSONObject json =  JSONObject.fromObject(results);
+        String resultcod  = json.get("code").toString();
+        if("0".equals(resultcod)){
+            return "SUCCESS";
+        }else{
+            return "验证码发送失败，请稍后重试";
+        }
+    }
+
+    /**
+     * 配置云片相关信息并发送请求
+     * @param text		发送的内容
+     * @param mobile	手机号
+     * @return
+     */
+    public static String sendSms(String text, String mobile)  {
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("apikey", ImberryConfig.INTER_SMS_KEY);
+        params.put("text", text);
+        params.put("mobile", mobile);
+        return post(ImberryConfig.INTER_SMS_URL, params);
+    }
+
+    /** 基于HttpClient 4.3的通用POST方法
+     * @param url       提交的URL
+     * @param paramsMap 提交<参数，值>Map
+     * @return 提交响应
+     */
+    public static String post(String url, Map<String, String> paramsMap) {
+        CloseableHttpClient client = HttpClients.createDefault();
+        String responseText = "";
+        CloseableHttpResponse response = null;
+        try {
+            HttpPost method = new HttpPost(url);
+            if (paramsMap != null) {
+                List<NameValuePair> paramList = new ArrayList<NameValuePair>();
+                for (Map.Entry<String, String> param : paramsMap.entrySet()) {
+                    NameValuePair pair = new BasicNameValuePair(param.getKey(), param.getValue());
+                    paramList.add(pair);
+                }
+                method.setEntity(new UrlEncodedFormEntity(paramList, ENCODING));
+            }
+            response = client.execute(method);
+            HttpEntity entity = response.getEntity();
+            if (entity != null) {
+                responseText = EntityUtils.toString(entity);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                response.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return responseText;
+    }
+
+    @Override
+    public ResponseJson validCode(String phone, String code) {
+        ResponseJson json = new ResponseJson();
+        PhoneCode phoneCode = new PhoneCode();
+        phoneCode.setCodeTel(phone);
+        //根据手机号码获取验证码
+        phoneCode = phoneCodeMapper.getPhoneCode(phoneCode);
+        // 校验
+        if (phoneCode == null) {
+            // 操作有误
+            json.setReturnCode(404);
+            json.addResponseKeyValue("验证失败");
+            return json;
+        }
+        Date now = new Date();
+        if (now.getTime() >= (phoneCode.getCodeSendTime().getTime() + 180000)) {
+            // 验证码无效
+            json.setReturnCode(404);
+            json.addResponseKeyValue("验证码无效");
+            return json;
+        }
+        // 必须 验证码正确，并且场景正确
+        if (!code.equals(phoneCode.getCodePhoneCode())) {
+            // 验证码错误
+            json.setReturnCode(404);
+            json.addResponseKeyValue("验证码错误");
+            return json;
+        }
+        // 只要校验，表示本次验证码使用
+        json.setReturnCode(200);
+        json.addResponseKeyValue("SUCCESS");
+        return json;
+    }
+
+    public static String getRandomCode(int len) {
+        StringBuilder sb = new StringBuilder(len);
+        for (int i = 0; i < len; i++)
+            sb.append("0123456789".charAt(rnd.nextInt("0123456789".length())));
+        return sb.toString();
+    }
+}

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/warranty/WarrantyServiceImpl.java

@@ -0,0 +1,129 @@
+package com.iamberry.wechat.service.warranty;
+
+import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
+import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.product.ProductColor;
+import com.iamberry.wechat.core.entity.warrantyCard.WarrantyCard;
+import com.iamberry.wechat.face.admin.SystemService;
+import com.iamberry.wechat.face.mq.EfastOrderService;
+import com.iamberry.wechat.face.warranty.WarrantyService;
+import com.iamberry.wechat.service.mapper.ProductInfoMapper;
+import com.iamberry.wechat.service.mapper.WarrantyMapper;
+import com.iamberry.wechat.tools.ResultInfo;
+import net.sf.json.JSONArray;
+import org.hibernate.validator.constraints.URL;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 质保卡servlet
+ * Created by liuzhiwei on 2017/12/21.
+ */
+@Service
+public class WarrantyServiceImpl implements WarrantyService {
+
+    @Autowired
+    private EfastOrderService efastOrderService;
+    @Autowired
+    private ProductInfoMapper productInfoMapper;
+    @Autowired
+    private SystemService systemService;
+    @Autowired
+    private WarrantyMapper warrantyMapper;
+
+    @Override
+    public boolean addWarrantyList(String txtOrderId, Member member, String cardWatero,
+                                   String cardProvince, String cardCity, String cardDistrict) throws Exception {
+
+        List<WarrantyCard> cardList = new ArrayList<WarrantyCard>();
+        boolean flag = false;
+        int sum = 0;
+        //循环添加机器信息
+        if (txtOrderId != null && !"".equals(txtOrderId)) {
+            txtOrderId = txtOrderId.substring(0,txtOrderId.lastIndexOf(","));
+            //获取交易号
+            String[] orderIds = txtOrderId.split(",");
+            for (int i = 0;i < orderIds.length;i++) {
+                //获取百胜订单详情
+                net.sf.json.JSONObject orderInfo = efastOrderService.getOrderFormEfast(orderIds[i]);
+                if (orderInfo == null || !orderInfo.has("orders")) {
+                    return flag;
+                }
+                //获取订单项集合
+                JSONArray itemArray = orderInfo.getJSONArray("orders");
+                if (itemArray == null || itemArray.size() == 0) {
+
+                }
+                for (int j = 0;j < itemArray.size();j++) {
+                    ProductColor color = new ProductColor();
+                    net.sf.json.JSONObject itemJson = itemArray.getJSONObject(j);
+                    color.setColor69Code(itemJson.getString("goods_sn"));
+                    //根据产品69码查询产品颜色信息
+                    color = productInfoMapper.getProductColor(color);
+                    if (color == null) {
+                        continue;
+                    }
+                    //获取换新时间期限
+                    ShopSystemRule endRule =  systemService.selectOneShopRuleById(242);
+                    WarrantyCard card = new WarrantyCard();
+                    card.setCardSalesTime(new Date(orderInfo.getLong("pay_time")*1000));
+                    card.setProductChildType(color.getProductChildType());
+                    card.setProductType(color.getColorProductType());
+                    card.setCardEndTime(updateDate(card.getCardSalesTime(),endRule.getRuleNum().intValue()));
+                    card.setCardCity(cardCity);
+                    card.setCardDistrict(cardDistrict);
+                    card.setCardProvince(cardProvince);
+                    card.setCardWatero(Integer.parseInt(cardWatero));
+                    card.setCardProductName(color.getColorProductName());
+                    card.setCardTypeState(1);
+                    card.setUserOpenId(member.getUserOpenid());
+                    card.setCardCreateDate(new Date());
+
+                    //查询该质保卡信息，如果存在，则不再添加
+                    List<WarrantyCard> list = warrantyMapper.listWarrantyCard(card);
+                    if (list != null || list.size() > 0) {
+                        continue;
+                    }
+
+                    //生成编号
+                    sum++;
+                    String userid = member.getUserId().toString();
+                    int len = 11;//条形码不加sum的定长
+                    StringBuilder berQrcode = new StringBuilder(userid);
+                    String dateTime = String.valueOf(new Date().getTime());
+                    int dateTimeLen = len - userid.length();
+                    dateTime = dateTime.substring(0,dateTimeLen);
+                    berQrcode.append(dateTime);
+                    card.setCardNo(berQrcode.toString() + sum);
+                    cardList.add(card);
+                }
+            }
+        }
+        //批量添加质保卡信息
+        int num = warrantyMapper.addWarrantyCardList(cardList);
+        if (num > 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 修改日期 增加月
+     * @param date
+     * @param month
+     * @return
+     * @throws Exception
+     */
+    public Date updateDate(Date date,int month) throws Exception {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.MONTH, month);
+        return calendar.getTime();
+    }
+}

iamberry-wechat-web/iamberry-wechat-web.iml

@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
-        </webroots>
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="iamberry-common-web" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
-    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.12" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.12" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
-    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
-    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
-    <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
-    <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
-    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
-    <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
-    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
-    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.1" level="project" />
-    <orderEntry type="module" module-name="iamberry-wechat-interface" />
-    <orderEntry type="module" module-name="iamberry-common-core" />
-    <orderEntry type="module" module-name="iamberry-common-tool" />
-    <orderEntry type="module" module-name="iamberry-common-config" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.elasticsearch:securesm:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.joda:joda-convert:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.3" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.ning:compress-lzf:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.tdunning:t-digest:3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.twitter:jsr166e:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet.jsp:javax.servlet.jsp-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
-    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
-    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
-    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
-    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
-  </component>
-</module>

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -296,6 +296,11 @@ public class OrderHandler {
 				item.setItemTotal(subTotal);
 				item.setItemProductType(cartDto.getProductType());
 				item.setItemProductPrice(cartDto.getProductDiscount());
+				item.setItemColorId(cartDto.getCartColorId());
+				/*item.setItemProductColor();
+				item.setItemProductChildType();
+				item.setItemIsSource();*/
+
 				list.add(item);
 			}
 		}

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/warranty/WarrantyCardHandler.java

@@ -5,12 +5,18 @@ import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.WechatUtils;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.product.ProductColor;
 import com.iamberry.wechat.core.entity.warrantyCard.WarrantyCard;
 import com.iamberry.wechat.face.admin.SystemService;
+import com.iamberry.wechat.face.cart.ProductInfoService;
+import com.iamberry.wechat.face.mq.EfastOrderService;
+import com.iamberry.wechat.face.phone.PhoneCodeService;
+import com.iamberry.wechat.face.warranty.WarrantyService;
 import com.iamberry.wechat.tools.HttpClient431Util;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.ResultInfo;
+import net.sf.json.JSONArray;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.ParseException;
 import org.json.JSONException;
@@ -47,6 +53,10 @@ public class WarrantyCardHandler {
     private SystemService systemService;
     @Autowired
     private WechatUtils wechatUtils;
+    @Autowired
+    private PhoneCodeService phoneCodeService;
+    @Autowired
+    private WarrantyService warrantyService;
 
     /**
      * 根据电话号码查询百胜订单信息
@@ -120,16 +130,13 @@ public class WarrantyCardHandler {
     public ResultMsg addWarrantyCardList(HttpServletRequest request, Member member) throws Exception {
         ResultMsg msg = new ResultMsg();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String numberWatero = request.getParameter("numberWatero");
-        String numberProvince = request.getParameter("numberProvince");
-        String numberCity = request.getParameter("numberCity");
-        String numberDistrict = request.getParameter("numberDistrict");
-
-        List<WarrantyCard> list = new ArrayList<WarrantyCard>();
-        Member memberInfo = wechatUtils.getUserBySession(request);
-        String txtTime = request.getParameter("txtTime");
+        String cardWatero = request.getParameter("cardWatero");
+        String cardProvince = request.getParameter("cardProvince");
+        String cardCity = request.getParameter("cardCity");
+        String cardDistrict = request.getParameter("cardDistrict");
+        String txtOrderId = request.getParameter("txtOrderId");
         //查询用户信息
-        /*memberInfo = memberService.getMemberByUserOpenId(memberInfo.getUserOpenid());
+        Member memberInfo = wechatUtils.getUserBySession(request);
         if (memberInfo == null) {
             msg.setResultCode(ResultInfo.ERRORCODE);
             msg.setStatus(false);
@@ -137,18 +144,19 @@ public class WarrantyCardHandler {
             return msg;
         }
         member.setUserId(memberInfo.getUserId());
+        member.setUserOpenid(memberInfo.getUserOpenid());
 
-        if (!StringUtils.isNotEmpty(numberProvince)) {
+        if (!StringUtils.isNotEmpty(cardProvince)) {
             String ip = getIp(request);
             Map<String,Object> locations = getLocation(ip);
             if (StringUtils.isNotEmpty((String)locations.get("province"))) {
-                numberProvince = (String)locations.get("province");
-                numberCity = (String)locations.get("city");
-                numberDistrict = (String)locations.get("district");
+                cardProvince = (String)locations.get("province");
+                cardCity = (String)locations.get("city");
+                cardDistrict = (String)locations.get("district");
             }
         }
 
-        if (!StringUtils.isNotEmpty(numberWatero)) {
+        if (!StringUtils.isNotEmpty(cardWatero)) {
             msg.setResultCode(ResultInfo.ERRORCODE);
             msg.setStatus(false);
             msg.setMessage("水质范围为空,请重新填写水质范围!");
@@ -156,7 +164,7 @@ public class WarrantyCardHandler {
         }
 
         //验证手机验证码是否正确
-        ResponseJson code = codeService.validCode(member.getUserTel(),member.getPhoneCode());
+        ResponseJson code = phoneCodeService.validCode(member.getUserTel(),member.getPhoneCode());
         if (code.getReturnCode() != 200) {
             msg.setResultCode(ResultInfo.ERRORCODE);
             msg.setStatus(false);
@@ -164,31 +172,16 @@ public class WarrantyCardHandler {
             return msg;
         }
 
-        //循环添加机器信息
-        if (txtTime != null && !"".equals(txtTime)) {
-            txtTime = txtTime.substring(0,txtTime.lastIndexOf(","));
-            String[] times = txtTime.split(",");
-            for (int i = 0;i < times.length;i++) {
-                MachineNumber machineNumber = new MachineNumber();
-                machineNumber.setNumberOpenId(memberInfo.getUserOpenid());
-                machineNumber.setNumberSalesTime(format.parse(times[i]));
-                machineNumber.setNumberWatero(Integer.parseInt(numberWatero));
-                machineNumber.setNumberProvince(numberProvince);
-                machineNumber.setNumberCity(numberCity);
-                machineNumber.setNumberDistrict(numberDistrict);
-                list.add(machineNumber);
-            }
-        }
-
         //添加机器信息
-        boolean flag = machineNumberService.addMachineNumberList(list, memberInfo.getUserOpenid(), member);
+        boolean flag = warrantyService.addWarrantyList(txtOrderId,member,cardWatero,
+                cardProvince,cardCity,cardDistrict);
         if (flag) {
             msg.setResultCode(ResultInfo.SUCCESSCODE);
             msg.setStatus(true);
         } else {
             msg.setResultCode(ResultInfo.ERRORCODE);
             msg.setStatus(false);
-        }*/
+        }
         return msg;
     }
 

iamberry-wechat-web/src/main/resources/iamberry-wechat-service-mybatis.xml

@@ -133,7 +133,16 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.ZTreeBean" alias="ZTreeBean"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.drp.ApplyPlaceLogs" alias="ApplyPlaceLogs"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.WechatShare" alias="WechatShare"/>
-	
+
+		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductChildType" alias="ProductChildType"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductColor" alias="ProductColor"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductFittings" alias="ProductFittings"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.product.SalesUserGift" alias="SalesUserGift"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.search.SearchInfo" alias="SearchInfo"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.warrantyCard.WarrantyCard" alias="WarrantyCard"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.phone.PhoneCode" alias="PhoneCode"/>
+
+
 		<!-- 【门店关注统计报表类】 -->
 		<typeAlias type="com.iamberry.wechat.core.entity.statictics.AttentionInfo" alias="AttentionInfo"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.statictics.MarketInfo" alias="MarketInfo"/>
@@ -147,7 +156,7 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductType" alias="ProductType"/>
 		<!-- 【统计总信息类】 -->
 		<typeAlias type="com.iamberry.wechat.core.entity.statictics.StatisticsInfo" alias="StatisticsInfo"/>
-		
+
 		<!-- 定期任务 -->
 		<typeAlias type="com.iamberry.wechat.core.entity.task.WechatTask" alias="WechatTask"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.task.WechatTaskLogs" alias="WechatTaskLogs"/>
@@ -238,6 +247,8 @@
 		<mapper resource="com/iamberry/wechat/service/mapper/wdRelationMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/wechatShareMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/withdrawMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/phoneCodeMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/warrantyMapper.xml"/>
 	</mappers>
 
 </configuration>

watero-common-tool/src/main/java/com/iamberry/wechat/tools/SignUtil.java

@@ -28,7 +28,7 @@ public class SignUtil{
 		for (int i = 0; i < arr.length; i++) {
 			content.append(arr[i]);
 		}
-		
+
 		String tmpStr = Sha1Util.getSha1(content.toString());
 
 		content = null;

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSalesOrderController.java

@@ -292,8 +292,6 @@ public class AdminSalesOrderController {
     @RequiresPermissions("salesOrder:sync:order")
     @RequestMapping("/sync_efast_order")
     public ResponseJson syncEfastOrder(HttpServletRequest request) throws Exception {
-        int pageNo = 1;
-        int pageSize = 20;
         String salesDealCode = request.getParameter("salesDealCode");
         if (!StringUtils.isNotEmpty(salesDealCode)) {
             return new ResponseJson(500, "订单编号不能为空，请重新输入!", 500);

watero-wechat-service/src/main/java/com/iamberry/wechat/service/wechat/WeChatServiceImpl.java

@@ -290,7 +290,7 @@ public class WeChatServiceImpl implements WeChatService {
 		Map<String,String> params = new HashMap<String,String>();
 		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 		try {
-			//查询百胜订单信息
+			//查询rst订单信息
 			String resultJson = HttpClient431Util.doGet(params,url,null,null,null);
 			resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
 			inLongLogger.info("==========================获取机器信息成功,返回值为:" + resultJson + "=========================");
@@ -307,7 +307,7 @@ public class WeChatServiceImpl implements WeChatService {
 			str.append("您的<");
 			str.append(jsonMessage.getString("productType"));
 			str.append(">为正品，生产日期为：");
-			str.append(format.format(new Date(jsonMessage.getLong("producedTime")*1000)));
+			str.append(format.format(new Date(jsonMessage.getLong("producedTime"))));
 			str.append("。请放心使用。");
 			return str.toString();
 		} catch (Exception e) {

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/ProductInfoHandler.java

@@ -463,8 +463,8 @@ public class ProductInfoHandler {
 		if(StringUtils.isNotEmpty(shareOpenid)){
 			memberService.buildChildUser(shareOpenid, member,1,1);
 		}
-		//request.getRequestDispatcher(NameUtils.getConfig("WECHAT_SHOP_PRODUCT_DESC_PAGE")).forward(request, response);
-		response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_PRODUCT_DESC_PAGE"));
+		request.getRequestDispatcher(NameUtils.getConfig("WECHAT_SHOP_PRODUCT_DESC_PAGE")).forward(request, response);
+		//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_PRODUCT_DESC_PAGE"));
 		return;
 	}
 	

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/pay/RequestWechatPayHandler.java

@@ -88,20 +88,22 @@ public class RequestWechatPayHandler {
 	 * @throws Exception 
 	 */
 	@RequestMapping(value = "/settlement", method = RequestMethod.GET)
-	public void settlement(
+	public ModelAndView settlement(
 			@RequestParam("cartId") String cartIds, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		//ModelAndView mv = new ModelAndView("forward:" + NameUtils.getConfig("WECHAT_SHOP_INDEX")); // 回到购物车页面
+		ModelAndView mv = new ModelAndView("forward:" + NameUtils.getConfig("WECHAT_SHOP_INDEX")); // 回到购物车页面
 		// 用户信息
-//		WechatUtils.getUserBySession(request);
+		//WechatUtils.getUserBySession(request);
 		// 清空数据
 		//request.getSession().removeAttribute("cartIds");
 		
 		if ((cartIds == null || cartIds.isEmpty()))
-			response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			return mv;
+			//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
 		// split 购物车ID
 		String [] cartList = cartIds.split("-");
 		if (cartList == null || cartList.length <= 0) {
-			response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			return mv;
 		}
 		// 转化 String 类型的购物车ID集合 --> Integer 类型的购物车集合
 		Integer[] cartIntList = new Integer[cartList.length];
@@ -110,16 +112,19 @@ public class RequestWechatPayHandler {
 			try {
 				cartIntList[i] = Integer.parseInt(string);
 			} catch (Exception e) {
-				response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+				//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+				return mv;
 			}
 		}
 		if (cartIntList.length <= 0) {
-			response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			return mv;
 		}
 		// 根据购物车ID，查询数据库中对应的产品信息（ID、产品状态）
 		List<CartDto> cartDtos = cartService.selectCartItemByListId(cartIntList);
 		if (cartDtos == null || cartDtos.size() <= 0) {
-			response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			return mv;
 		}
 		// 判断当前提交的购物车ID，有多少产品在售
 		int sum = 0;
@@ -128,11 +133,12 @@ public class RequestWechatPayHandler {
 				sum++;
 		}
 		if (sum <= 0) {
-			response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_INDEX"));
+			return mv;
 		}
-		//mv.setViewName("forward:" + NameUtils.getConfig("WECHAT_SHOP_ORDER_PAY")); // 支付页面
-		response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_ORDER_PAY") + "?cartId="+cartIds);
-	
+		mv.setViewName("forward:" + NameUtils.getConfig("WECHAT_SHOP_ORDER_PAY")); // 支付页面
+		//response.sendRedirect(NameUtils.getConfig("WECHAT_SHOP_ORDER_PAY") + "?cartId="+cartIds);
+		return mv;
 	}
 	
 	/**

wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/wechat/WeChatServiceImpl.java

@@ -296,7 +296,7 @@ public class WeChatServiceImpl implements WeChatService {
 		Map<String,String> params = new HashMap<String,String>();
 		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 		try {
-			//查询百胜订单信息
+			//查询rst订单信息
 			String resultJson = HttpClient431Util.doGet(params,url,null,null,null);
 			resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
 			inLongLogger.info("==========================获取机器信息成功,返回值为:" + resultJson + "=========================");
@@ -313,7 +313,7 @@ public class WeChatServiceImpl implements WeChatService {
 			str.append("您的<");
 			str.append(jsonMessage.getString("productType"));
 			str.append(">为正品，生产日期为：");
-			str.append(format.format(new Date(jsonMessage.getLong("producedTime")*1000)));
+			str.append(format.format(new Date(jsonMessage.getLong("producedTime"))));
 			str.append("。请放心使用。");
 			return str.toString();
 		} catch (Exception e) {

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/other/index.html

@@ -90,7 +90,7 @@
                 //在微信中打开
                 mask.show(); //显示遮罩
                 }else{
-                location.href='https://itunes.apple.com/cn/app/bi-bi-meng/id1117339790?mt=8';
+                location.href='//itunes.apple.com/cn/app/bi-bi-meng/id1117339790?mt=8';
                 }
 		});
 	});
@@ -107,7 +107,7 @@
 	}
 	
 	function toAibeiyuan(){
-		location.href='http://www.iamberry.com';
+		location.href='//www.iamberry.com';
 	}
 	
 	</script>

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/wechat/gift_card_exchange_list.html

@@ -135,7 +135,7 @@
 								var urlStr = document.domain;
 								if(typeof(this.getAttribute("postFirm"))!="undefined" && typeof(this.getAttribute("postNum"))!="undefined"){
 									mui.openWindow({
-										url: 'http://m.kuaidi100.com/index_all.html?type=' + this.getAttribute("postFirm") + '&postid=' + this.getAttribute("postNum") + '&callbackurl=http://' + urlStr + this.getAttribute("gourl") + "&tiemstamp=" + new Date().getTime()
+										url: '//m.kuaidi100.com/index_all.html?type=' + this.getAttribute("postFirm") + '&postid=' + this.getAttribute("postNum") + '&callbackurl=//' + urlStr + this.getAttribute("gourl") + "&tiemstamp=" + new Date().getTime()
 									})
 								}
 							});

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/wechat/iamberry_video.html

@@ -40,7 +40,7 @@
 		</a>
 	</nav>
 	<div class="mui-content">
-		<iframe class="my_iframe" src="https://v.qq.com/iframe/player.html?vid=o0344c2okps&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+		<iframe class="my_iframe" src="//v.qq.com/iframe/player.html?vid=o0344c2okps&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
 		<div class="mui-content-padded">
 			<ul>
 				<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;迄今，现有水源被检测出有2221种有机污染物，其中自来水中发现65种，20种能致癌，56种能致突变。我们每喝一口的自来水，氯气净化下，烧开后残留的余氯会生成致癌物三氯甲烷，长期饮用对人体造成非常大的危害。所以直接饮用自来水烧开后的水也不是健康的选择，对自来水进行再净化已是普遍健康共识。</li><br/>

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/wechat/iamberry_video_list.html

@@ -24,7 +24,7 @@
 		</div>
 
 		<div class="mui-content" style="background: #fff;">
-			<iframe class="my_iframe" src="https://v.qq.com/iframe/player.html?vid=z0318vtrn4c&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+			<iframe class="my_iframe" src="//v.qq.com/iframe/player.html?vid=z0318vtrn4c&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
 			<div style="margin: 0 10px;">
 				<ul>
 					<li>爱贝源智能冲奶机</li>
@@ -36,19 +36,19 @@
 			<ul class="mui-table-view mui-grid-view">
 				
 		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=t0313illa3u&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+		            <iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=t0313illa3u&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
 		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——如何连接APP篇</div>
 		        </li>
 		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=p0312bl06ak&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+		            <iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=p0312bl06ak&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
 		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——温度测试篇</div>
 		        </li>
 		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=y0315x9b86z&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+		            <iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=y0315x9b86z&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
 		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——奶量测试篇</div>
 		        </li>
 		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=g0317oa3yu3&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+		            <iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=g0317oa3yu3&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
 		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——奶机的日常清洁 </div>
 		        </li>
 		    </ul>  

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/wechat/wheel_log.html

@@ -145,7 +145,7 @@
 	});	
 	mui('body').on('tap', '#whell-bar .mui-btn', function() {
 		mui.openWindow({
-		url:'https://w.iamberry.com/wateroPF/wechat/index'
+		url:'//w.iamberry.com/wateroPF/wechat/index'
 		});
 	});
 		</script>

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/wechat/zhuanpan.html

@@ -113,7 +113,7 @@
 			window.repleFlag = false;
 			window.wxFriend = {
 				    "appId": "",
-				    "imgUrl":'//s.iamberry.com/images/shop/8.png',
+				    "imgUrl":'https://s.iamberry.com/images/shop/8.png',
 				    "link":domanUrl+"/iamberry/wechat/activity/go_luck_draw",
 				    "desc":"万圣节8秒冲奶，一键搞定捣蛋宝宝，快来围观爱贝源智能冲奶机，有大奖品抽哦！",//描述
 				    "title":"3次免费抽，100%中奖，宝宝手推车抱回家，快来转转转！",			//标题
@@ -199,7 +199,7 @@
 					var r=confirm("您没有抽奖次数了，是否马上前往购买商品？");
 					if (r==true){
 						mui.openWindow({
-							url:'http://h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
+							url:'//h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
 						});
 					}
 					return;
@@ -243,7 +243,7 @@
 								setTimeout(function(){
 								mui.alert('<img src="'+img+'" /><span class="x-close"></span>','获得'+msg,'马上下单',function(){
 									mui.openWindow({
-										url:'http://h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
+										url:'//h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
 									});
 								});
 								},3000);

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/chanpin_details.js

@@ -55,7 +55,7 @@ mui.ready(function() {
     window.repleFlag = false;
     window.wxFriend = {
         "appId": "",
-        "imgUrl": 'http://static.iamberry.com/wateroPF/images/logo_wateroPF.jpg',
+        "imgUrl": 'https://s.iamberry.com/wateroPF/images/logo_wateroPF.jpg',
         "link": url,
         "desc": "美国标准，4级净化，5档水温，水质TDS智能显示。",
         "title": "WaterO，美国可移动智能净水机代表，4级净化，5档水温，净化饮水一体；",

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/chanpin_list.js

@@ -45,16 +45,16 @@ function pullupRefresh() {
 					var img='';
 					switch (this.colorId){
 					case 1:
-						img='http://static.iamberry.com/wateroPF/images/shop/cp-blue.png'
+						img='//s.iamberry.com/wateroPF/images/shop/cp-blue.png'
 						break;
 					case 2:
-						img='http://static.iamberry.com/wateroPF/images/shop/cp-black.png'
+						img='//s.iamberry.com/wateroPF/images/shop/cp-black.png'
 						break;
 					case 3:
-						img='http://static.iamberry.com/wateroPF/images/shop/cp-green.png'
+						img='//s.iamberry.com/wateroPF/images/shop/cp-green.png'
 						break;
 					case 4:
-						img='http://static.iamberry.com/wateroPF/images/shop/cp-red.png'
+						img='//s.iamberry.com/wateroPF/images/shop/cp-red.png'
 						break;
 					default:
 						break;

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/clearing.js

@@ -106,7 +106,7 @@ mui.ready(function() {
 					liNote = liNote +
 						"<li class='mui-table-view-cell mui-media'>" +
 						"<a>" +
-						"<span class='mui-media-object mui-pull-left wh-100'> <img src='http://w.iamberry.com/wateroPF/common/images/uploadimages/image/20161202/2C83538AC3039E693358_20161202182946_8118.jpg'></span>" +
+						"<span class='mui-media-object mui-pull-left wh-100'> <img src='//w.iamberry.com/wateroPF/common/images/uploadimages/image/20161202/2C83538AC3039E693358_20161202182946_8118.jpg'></span>" +
 						"<div class='mui-media-body'>" +
 						"<div class='wt-space gwc_tit'>" +
 						'赠送' + "<span id='giveNum'>" + cNum + '</span>' + '套三年滤芯' +

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/common_var.js

@@ -1 +1 @@
-var staticUrl = 'http://static.iamberry.com/wateroPF';
+var staticUrl = '//s.iamberry.com/wateroPF';

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_center.js

@@ -253,7 +253,7 @@ function fenxiao_center_data() {
 				window.repleFlag = false;
 				window.wxFriend = {
 					"appId": "",
-					"imgUrl": 'http://static.iamberry.com/wateroPF/images/shop/index.jpg',
+					"imgUrl": 'https://s.iamberry.com/wateroPF/images/shop/index.jpg',
 					"link": link,
 					"desc": "美国标准，4级净化，5档水温，废水比3:1，水质TDS智能显示。",
 					"title": "Watero，美国高端净水专家，4级净化，5档水温，免安装饮水一体机。",

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_center2.js

@@ -176,7 +176,7 @@ function fenxiao_center_data() {
 				window.repleFlag = false;
 				window.wxFriend = {
 					"appId": "",
-					"imgUrl": 'http://static.iamberry.com/wateroPF/images/shop/index.jpg',
+					"imgUrl": 'https://s.iamberry.com/wateroPF/images/shop/index.jpg',
 					"link": link,
 					"desc": "美国标准，4级净化，5档水温，废水比3:1，水质TDS智能显示。",
 					"title": "Watero，美国高端净水专家，4级净化，5档水温，免安装饮水一体机。",

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/index.js

@@ -18,7 +18,7 @@ mui.ready(function() {
                 window.repleFlag = false;
                 window.wxFriend = {
                     "appId": "",
-                    "imgUrl": 'http://static.iamberry.com/wateroPF/images/logo_wateroPF.jpg',
+                    "imgUrl": 'https://s.iamberry.com/wateroPF/images/logo_wateroPF.jpg',
                     "link": link,
                     "desc": "美国标准，4级净化，5档水温，水质TDS智能显示。",
                     "title": "WaterO，美国可移动智能净水机代表，4级净化，5档水温，净化饮水一体；",

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/layer.js

@@ -29,7 +29,7 @@ function incoldeCssFile() {
 	var fileref = document.createElement('link');
 	fileref.setAttribute("rel","stylesheet");
 	fileref.setAttribute("type","text/css");
-	fileref.setAttribute("href","http://static.iamberry.com/wateroPF/js/shop/layer.css"); // 地址可以改变
+	fileref.setAttribute("href","//s.iamberry.com/wateroPF/js/shop/layer.css"); // 地址可以改变
 	document.getElementsByTagName("head")[0].appendChild(fileref);
 }
 //incoldeCssFile();

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/main.js

@@ -1,4 +1,4 @@
-var domanUrl = "http://" + window.location.host,
+var domanUrl = "//" + window.location.host,
 	base_path = "/wateroPF/wechat",
 	marquee = '';
 mui.each(document.querySelectorAll('#footer-bar .mui-tab-item'), function(index, el) {
@@ -459,19 +459,19 @@ function switchColorImg(colorId){
 	var img='';
 	switch (colorId){
 		case 1:
-			img='http://static.iamberry.com/wateroPF/images/shop/cp-blue.png'
+			img='//s.iamberry.com/wateroPF/images/shop/cp-blue.png'
 			break;
 		case 2:
-			img='http://static.iamberry.com/wateroPF/images/shop/cp-black.png'
+			img='//s.iamberry.com/wateroPF/images/shop/cp-black.png'
 			break;
 		case 3:
-			img='http://static.iamberry.com/wateroPF/images/shop/cp-green.png'
+			img='//s.iamberry.com/wateroPF/images/shop/cp-green.png'
 			break;
 		case 4:
-			img='http://static.iamberry.com/wateroPF/images/shop/cp-red.png'
+			img='//s.iamberry.com/wateroPF/images/shop/cp-red.png'
 			break;
 		default:
-			img='http://static.iamberry.com/wateroPF/images/shop/cp-blue.png'
+			img='//s.iamberry.com/wateroPF/images/shop/cp-blue.png'
 			break;
 	}
 	return img;

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/shopping_cart.js

@@ -90,16 +90,16 @@ function selectCart() {
 						if(dt.data.cartList[i].productType==1){
 						switch (dt.data.cartList[i].cartColorId){
 						case 1:
-							img='http://static.iamberry.com/wateroPF/images/shop/cp-blue.png';pro_color='品蓝';
+							img='//s.iamberry.com/wateroPF/images/shop/cp-blue.png';pro_color='品蓝';
 							break;
 						case 2:
-							img='http://static.iamberry.com/wateroPF/images/shop/cp-black.png';pro_color='品黑';
+							img='//s.iamberry.com/wateroPF/images/shop/cp-black.png';pro_color='品黑';
 							break;
 						case 3:
-							img='http://static.iamberry.com/wateroPF/images/shop/cp-green.png';pro_color='苹果绿';
+							img='//s.iamberry.com/wateroPF/images/shop/cp-green.png';pro_color='苹果绿';
 							break;
 						case 4:
-							img='http://static.iamberry.com/wateroPF/images/shop/cp-red.png';pro_color='西瓜红';
+							img='//s.iamberry.com/wateroPF/images/shop/cp-red.png';pro_color='西瓜红';
 							break;
 						default:
 							break;

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/vip_center.js

@@ -7,12 +7,12 @@ mui.ready(function() {
 			switch(index) {
 				case 0:
 					mui.openWindow({
-						url: 'https://s.iamberry.com/wateroPF/video/video.html'
+						url: '//s.iamberry.com/wateroPF/video/video.html'
 					});
 					break;
 				case 1:
 					mui.openWindow({
-						url: 'http://www.iamberry.com/iamberry_wechat/after_service_watero2.html'
+						url: '//www.iamberry.com/iamberry_wechat/after_service_watero2.html'
 					});
 					break;
 				case 2:
@@ -24,7 +24,7 @@ mui.ready(function() {
 					break;
 				case 3:
 					mui.openWindow({
-						url: 'http://w.iamberry.com/wateroPF/view/faq.html'
+						url: '//w.iamberry.com/wateroPF/view/faq.html'
 					});
 					break;
 				default:
@@ -193,22 +193,22 @@ mui('body').on('tap', '.go_try_order', function() {
 
 mui('body').on('tap', '#dansheng_deliver', function() {
     mui.openWindow({
-        url: 'http://s.iamberry.com/wateroPF/news/watero_ds.html'
+        url: '//s.iamberry.com/wateroPF/news/watero_ds.html'
     })
 });
 mui('body').on('tap', '#linian_deliver', function() {
     mui.openWindow({
-        url: 'http://s.iamberry.com/wateroPF/news/watero_ln.html'
+        url: '//s.iamberry.com/wateroPF/news/watero_ln.html'
     })
 });
 mui('body').on('tap', '#shiming_deliver', function() {
     mui.openWindow({
-        url: 'http://s.iamberry.com/wateroPF/news/watero_sm.html'
+        url: '//s.iamberry.com/wateroPF/news/watero_sm.html'
     })
 });
 mui('body').on('tap', '#zhinan_dalog', function() {
     mui.openWindow({
-        url: 'http://s.iamberry.com/wateroPF/video/video.html'
+        url: '//s.iamberry.com/wateroPF/video/video.html'
     })
 });
 function fenxiao_wm2() {

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/wechat-utils-1.0.js

@@ -20,8 +20,8 @@ if (window.repleFlag) {
 	// 使用全局默认
 	window.wxFriend = {
 	    "appId": "",
-	    "imgUrl":'http://m.iamberry.com/common/goods/images/indexShare.jpg',
-	    "link":"http://www.iamberry.com/ratfw/index",
+	    "imgUrl":'https://m.iamberry.com/common/goods/images/indexShare.jpg',
+	    "link":"//www.iamberry.com/ratfw/index",
 	    "desc":"这里是分享描述",
 	    "title":"这里是分享标题",
 	    "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
@@ -44,7 +44,7 @@ window.wechatAddr = {
 /** 引入JSSDK1.0基本组件,微信共享地址智能使用1.0版本，并且需要服务器返回参数支持 */
 //incoldeJSFile("http://res.wx.qq.com/open/js/jweixin-1.0.0.js");
 /** 引入JSSDK1.1基本组件 ，支持摇一摇、微信共享地址 */
-incoldeJSFile("http://res.wx.qq.com/open/js/jweixin-1.1.0.js"); 
+incoldeJSFile("//res.wx.qq.com/open/js/jweixin-1.1.0.js");
 getConfig(); // 配置JSSDK组件
 
 /** 获取服务器JSSDK参数配置 */

wateroPF-wechat-web/src/main/webapp/view/2017_51.html

@@ -15,7 +15,7 @@
 		<script>
 			// 屏蔽分享
 			//window.hiddenAllWechatMenu = true;
-	var url = 'http://'+document.domain+'/wateroPF/view/2017_51.html';
+	var url = '//'+document.domain+'/wateroPF/view/2017_51.html';
 	window.repleFlag = true;
 	window.repleWxData = {
 		"appId": "",

wateroPF-wechat-web/src/main/webapp/view/add_machine.html

@@ -101,7 +101,7 @@
 <script src="//s.iamberry.com/wateroPF/js/mui.picker.min.js"></script>
 <script src="//s.iamberry.com/wateroPF/js/jquery-2.1.1.min.js"></script>
 <script src="//s.iamberry.com/wateroPF/js/shop/main.js?v=2016101701"></script>
-<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
 <script type="text/javascript">
 

wateroPF-wechat-web/src/main/webapp/view/gift_card_give_order_list.html

@@ -149,7 +149,7 @@
 							mui('body').on('tap', '.show_post_info', function() {
 								var urlStr = document.domain;
 								mui.openWindow({
-									url: 'http://m.kuaidi100.com/index_all.html?type=' + this.getAttribute("postFirm") + '&postid=' + this.getAttribute("postNum") + '&callbackurl=http://' + urlStr + this.getAttribute("gourl") + "&tiemstamp=" + new Date().getTime()
+									url: '//m.kuaidi100.com/index_all.html?type=' + this.getAttribute("postFirm") + '&postid=' + this.getAttribute("postNum") + '&callbackurl=//' + urlStr + this.getAttribute("gourl") + "&tiemstamp=" + new Date().getTime()
 								})
 							});
 						} else {

wateroPF-wechat-web/src/main/webapp/view/gift_card_user_exchange.html

@@ -103,7 +103,7 @@
 				</form>
 				<ul class="mui-table-view" style="border-top:1px solid rgba(0,0,0,.1);border-bottom:1px solid rgba(0,0,0,.1);margin:10px 0;">
 					<li class="mui-table-view-cell" style="padding: 15px 15px;">
-						<a class="mui-navigate-right" id="go-gift-details" href="https://w.iamberry.com/wateroPF/wechat/product/desc?productId=34&colorId=1">
+						<a class="mui-navigate-right" id="go-gift-details" href="//w.iamberry.com/wateroPF/wechat/product/desc?productId=34&colorId=1">
 						查看产品详情
 						</a>	
 					</li>

wateroPF-wechat-web/src/main/webapp/view/i_want_lease_test.html

@@ -72,7 +72,7 @@
 		<script>
 			// 屏蔽分享
 			//window.hiddenAllWechatMenu = true;
-	var url = 'http://'+document.domain+'/wateroPF/view/i_want_lease_test.html';
+	var url = '//'+document.domain+'/wateroPF/view/i_want_lease_test.html';
 	window.repleFlag = true;
 	window.repleWxData = {
 		"appId": "",

wateroPF-wechat-web/src/main/webapp/view/input_machine.html

@@ -84,7 +84,7 @@
 				}
 
 				// 发起请求
-				var url = "http://test.iamberry.com/wateroPF/wechat/factory/info_by_mac";
+				var url = "//test.iamberry.com/wateroPF/wechat/factory/info_by_mac";
 				$.post(url,{"mac":mac},function(result){
 					if (result.resultCode != 200 || result.returnCode != 200) {
 						mui.alert("没有查找到机器，请检查");
@@ -107,7 +107,7 @@
 				wx.invoke('getWXDeviceTicket', {'deviceId':deviceId,'type':'1', 'connType':'blue'}, function(res) {
 					if (res.err_msg == "getWXDeviceTicket:ok") {
 						var ticket = res.ticket;
-						var url = "http://test.iamberry.com/wateroPF/wechat/factory/bind";
+						var url = "//test.iamberry.com/wateroPF/wechat/factory/bind";
 						$.post(url,{"ticket":ticket, "device_id":deviceId},function(result){
 							if (result.resultCode != 200 || result.returnCode != 200) {
 								mui.alert("绑定失败，请检查");
@@ -128,7 +128,7 @@
 				wx.invoke('getWXDeviceTicket', {'deviceId':deviceId,'type':'2', 'connType':'blue'}, function(res) {
 					if (res.err_msg == "getWXDeviceTicket:ok") {
 						var ticket = res.ticket;
-						var url = "http://test.iamberry.com/wateroPF/wechat/factory/un_bind";
+						var url = "//test.iamberry.com/wateroPF/wechat/factory/un_bind";
 						$.post(url,{"ticket":ticket, "device_id":deviceId},function(result){
 							if (result.resultCode != 200 || result.returnCode != 200) {
 								mui.alert("解除绑定失败，请检查");

wateroPF-wechat-web/src/main/webapp/view/lease_desc.html

@@ -65,7 +65,7 @@
 					case 0:
 						//产品资质
 						mui.openWindow({
-							url: 'http://w.iamberry.com/wateroPF/view/product/certificate.html'
+							url: '//w.iamberry.com/wateroPF/view/product/certificate.html'
 						});
 						break;
 					case 1:
@@ -77,13 +77,13 @@
 					case 2:
 						//功能介绍视频
 						mui.openWindow({
-							url: 'https://m.v.qq.com/x/page/y/1/k/y0348fng61k.html?ptag=v_qq_com%23v.play.adaptor%233'
+							url: '//m.v.qq.com/x/page/y/1/k/y0348fng61k.html?ptag=v_qq_com%23v.play.adaptor%233'
 						});
 						break;
 					case 3:
 						//生活场景视频
 						mui.openWindow({
-							url: 'https://m.v.qq.com/x/page/o/p/s/o0344c2okps.html?ptag=v_qq_com%23v.play.adaptor%233'
+							url: '//m.v.qq.com/x/page/o/p/s/o0344c2okps.html?ptag=v_qq_com%23v.play.adaptor%233'
 						});
 						break;
 					default:

wateroPF-wechat-web/src/main/webapp/view/lease_order_win.html

@@ -25,7 +25,7 @@
 		<script>
 			// 屏蔽分享
 			//window.hiddenAllWechatMenu = true;
-	var url = 'http://'+document.domain+'/wateroPF/view/i_want_lease_test.html';
+	var url = '//'+document.domain+'/wateroPF/view/i_want_lease_test.html';
 	window.repleFlag = true;
 	window.repleWxData = {
 		"appId": "",

wateroPF-wechat-web/src/main/webapp/view/push_jiangli.html

@@ -74,7 +74,7 @@
 		window.repleFlag = false;
 		window.wxFriend = {
 			"appId": "",
-			"imgUrl": '//s.iamberry.com/wateroPF/images/shop/share_lease_0.jpg',
+			"imgUrl": 'https://s.iamberry.com/wateroPF/images/shop/share_lease_0.jpg',
 			"link": url,
 			"desc": "高端智能净水机不用买，可以直接拿回家用啦！这是一款可租赁的智能净水机！体验好了，分享出去，还可有千元现金可以拿！",
 			"title": "Watero智能净水机免费用！还可赢现金豪礼！",

wateroPF-wechat-web/src/main/webapp/view/rent/iot.html

@@ -104,7 +104,7 @@
 					wx.invoke('getWXDeviceTicket', {'deviceId':d,'type':'2', 'connType':'blue'}, function(res) {
 						try
 						{
-							new Image().src = "http://test.iamberry.com/wateroPF/ticket/" + JSON.stringify(res);
+							new Image().src = "//test.iamberry.com/wateroPF/ticket/" + JSON.stringify(res);
 						} catch (err) {
 						}
 					});

wateroPF-wechat-web/src/main/webapp/view/rent/lease_order_details.html

@@ -320,13 +320,13 @@
 						//console.log(dt);						
 						if(dt.status) {
 							mask.show();//显示遮罩
-							var url = encodeURI('http://' + window.location.host+'/wateroPF/view/rent/lease_for_my_equipment.html?shareId=' + dt.data);
+							var url = encodeURI('//' + window.location.host+'/wateroPF/view/rent/lease_for_my_equipment.html?shareId=' + dt.data);
 							var desc = userNickName + "送给你一台净水机，为你送上一份饮水健康。";
 							window.repleFlag = false;
 							window.hiddenAllWechatMenu = false;		//window.wxFriend window.repleWxData 
 							window.wxFriend = {
 								"appId": "",
-								"imgUrl": '//s.iamberry.com/wateroPF/images/shop/share-lease.png',
+								"imgUrl": 'https://s.iamberry.com/wateroPF/images/shop/share-lease.png',
 								"link": url,
 								"desc": desc,
 								"title": "给你送净水机了，快来领取吧!",

wateroPF-wechat-web/src/main/webapp/view/water_competition.html

@@ -26,7 +26,7 @@
             var shareId=getParam("shareId");
             // 屏蔽分享
             //window.hiddenAllWechatMenu = true;
-            var url = 'http://'+document.domain+'/wateroPF/view/water_competition.html?shareId='+shareId;
+            var url = '//'+document.domain+'/wateroPF/view/water_competition.html?shareId='+shareId;
             window.repleFlag = true;
             window.repleWxData = {
                 "appId": "",

wateroPF-wechat-web/src/main/webapp/view/water_competition_for_me.html

@@ -119,17 +119,17 @@
                 }else{
                     console.log(dt);
                     if(dt.status) {
-                        var url = 'http://'+document.domain+'/wateroPF/view/water_competition.html?shareId='+dt.data;
+                        var url = '//'+document.domain+'/wateroPF/view/water_competition.html?shareId='+dt.data;
                         window.wxData = {
                             "appId": "", // 服务号可以填写appId
-                            "imgUrl":'//s.iamberry.com/wateroPF/images/shop/share-lease.png',
+                            "imgUrl":'https://s.iamberry.com/wateroPF/images/shop/share-lease.png',
                             "link":url,
                             "desc":"快来围观吧，美国watero一款可移动的净水机!",
                             "title":"净水机可以租啦！"
                         };
                         window.wxFriend = {
                             "appId": "", // 服务号可以填写appId
-                            "imgUrl":'//s.iamberry.com/wateroPF/images/shop/share-lease.png',
+                            "imgUrl":'https://s.iamberry.com/wateroPF/images/shop/share-lease.png',
                             "link":url,
                             "desc":"快来围观吧，美国watero一款可移动的净水机！",
                             "title":"净水机可以租啦！"

wateroPF-wechat-web/src/main/webapp/wechat/test/index.html

@@ -7,13 +7,13 @@
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 		<title></title>
-		<link rel="stylesheet" href="http://h5.iamberry.com/iamberry/wechat/test/css/animate.css">
-		<link rel="stylesheet" href="http://h5.iamberry.com/iamberry/wechat/test/css/mobile.css">
-		<link rel="stylesheet" href="http://h5.iamberry.com/iamberry/wechat/test/css/newapp.css" />
-		<script src="http://h5.iamberry.com/iamberry/wechat/test/js/mobile.js"></script>
-		<script type="text/javascript" src="http://h5.iamberry.com/iamberry/wechat/test/js/zepto.min.js"></script>
-		<script type="text/javascript" src="http://h5.iamberry.com/iamberry/wechat/test/js/Touch.js"></script>
-		<script src="http://s95.cnzz.com/z_stat.php?id=1260151428&web_id=1260151428" language="JavaScript"></script>
+		<link rel="stylesheet" href="//h5.iamberry.com/iamberry/wechat/test/css/animate.css">
+		<link rel="stylesheet" href="//h5.iamberry.com/iamberry/wechat/test/css/mobile.css">
+		<link rel="stylesheet" href="//h5.iamberry.com/iamberry/wechat/test/css/newapp.css" />
+		<script src="//h5.iamberry.com/iamberry/wechat/test/js/mobile.js"></script>
+		<script type="text/javascript" src="//h5.iamberry.com/iamberry/wechat/test/js/zepto.min.js"></script>
+		<script type="text/javascript" src="//h5.iamberry.com/iamberry/wechat/test/js/Touch.js"></script>
+		<script src="//s95.cnzz.com/z_stat.php?id=1260151428&web_id=1260151428" language="JavaScript"></script>
 		<style>
 			#button{
 				background:pink;
@@ -48,21 +48,21 @@
 		</div>
 		<div id="page2" class="page out" data-form="slideup">
 			<div class="bg_2">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/logo.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-2.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo"><img src="//h5.iamberry.com/iamberry/wechat/test/images/logo.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-2.png" /></div>
 				</div>
 				<div class="two_2">
-					<img class="smallbig1" src="http://h5.iamberry.com/iamberry/wechat/test/images/2-3.png" /><img class="smallbig2" src="http://h5.iamberry.com/iamberry/wechat/test/images/2-4.png" /><img class="smallbig3" src="http://h5.iamberry.com/iamberry/wechat/test/images/2-5.png" />
+					<img class="smallbig1" src="//h5.iamberry.com/iamberry/wechat/test/images/2-3.png" /><img class="smallbig2" src="//h5.iamberry.com/iamberry/wechat/test/images/2-4.png" /><img class="smallbig3" src="//h5.iamberry.com/iamberry/wechat/test/images/2-5.png" />
 				</div>
 			</div>
 			<a class="move"></a>
 		</div>
 		<div id="page3" class="page out" data-form="slideup">
 			<div class="bg_3">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-2.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-2.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h1 class="cl-red">储存数千种奶粉品牌</h1>
@@ -73,9 +73,9 @@
 		</div>
 		<div id="page5" class="page out" data-form="slideup">
 			<div class="bg_4">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/4-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/4-1.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h1 class="cl-red">美国FDA认证材质</h1>
@@ -86,9 +86,9 @@
 		</div>
 		<div id="page4" class="page out" data-form="slideup">
 			<div class="bg_5">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/5-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/5-1.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h1 class="cl-red">3级温控系统</h1>
@@ -99,28 +99,28 @@
 		</div>
 		<div id="page6" class="page out" data-form="slideup">
 			<div class="bg_6">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/6-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/6-1.png" /></div>
 				</div>
 				<div style="text-align: left;padding-left: 8%;">
 					<h1 class="cl-red">多种母婴智能应用</h1>
-					<div class="six_2 leftin_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/6-2.png" /></div>
-					<div class="six_2 leftin_2"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/6-3.png" /></div>
-					<div class="six_2 leftin_3"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/6-4.png" /></div>
+					<div class="six_2 leftin_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/6-2.png" /></div>
+					<div class="six_2 leftin_2"><img src="//h5.iamberry.com/iamberry/wechat/test/images/6-3.png" /></div>
+					<div class="six_2 leftin_3"><img src="//h5.iamberry.com/iamberry/wechat/test/images/6-4.png" /></div>
 				</div>
 			</div>
 			<a class="move"></a>
 		</div>
 		<div id="page7" class="page out" data-form="slideup">
 			<div class="bg_7">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/7-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/7-1.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h5 class="cl-gray">请长按识别二维码购买冲奶机</h5>
-					<div class="share-2wm"><img style="width: 50%;" src="http://h5.iamberry.com/iamberry/wechat/test/images/7-2.png" /></div>
+					<div class="share-2wm"><img style="width: 50%;" src="//h5.iamberry.com/iamberry/wechat/test/images/7-2.png" /></div>
 					<h5 class="cl-gray">今天不购买还可以</h5>
 					<div class="btn_box">
 							上滑参与调研抽大奖
@@ -131,7 +131,7 @@
 		</div>
 		<div id="page8" class="page out" data-form="slideup">
 			<div class="bg_8">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/7-5.png" />
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/7-5.png" />
 				</div>
 				<div style="position:relative;padding:5px 20px;">
 					<ul>
@@ -168,13 +168,13 @@
 		</div>
 		<div id="page9" class="page out" data-form="slideup">
 			<div class="bg_9">
-				<div class="top_title"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
-				<div class="logo1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
-				<div class="two_1"><img src="http://h5.iamberry.com/iamberry/wechat/test/images/9-1.png" /></div>
+				<div class="top_title"><img src="//h5.iamberry.com/iamberry/wechat/test/images/2-1.png" />
+				<div class="logo1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/3-1.png" /></div>
+				<div class="two_1"><img src="//h5.iamberry.com/iamberry/wechat/test/images/9-1.png" /></div>
 				</div>
 				<div style="text-align: center;">
 					<h5 class="cl-gray"> 宝宝心里苦，爱贝源帮宝宝说出来</h5>
-					<div class="share-2wm"><img style="width: 50%;" src="http://h5.iamberry.com/iamberry/wechat/test/images/7-2.png" id="share-2wm-image"/></div>
+					<div class="share-2wm"><img style="width: 50%;" src="//h5.iamberry.com/iamberry/wechat/test/images/7-2.png" id="share-2wm-image"/></div>
 					<h5 class="cl-gray">请长按识别二维码</h5>
 					<div class="btn_box">
 							关注爱贝源
@@ -197,6 +197,6 @@
 			</div>
 		</div>-->
 	</body>
-	<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
-	<script type="text/javascript" src="http://h5.iamberry.com/iamberry/wechat/test/js/main.js?v=sdfasdfssfsdfsdfdasd" charset="utf-8"></script>
+	<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
+	<script type="text/javascript" src="//h5.iamberry.com/iamberry/wechat/test/js/main.js?v=sdfasdfssfsdfsdfdasd" charset="utf-8"></script>
 </html>