Merge branch 'master' of http://192.168.20.122:3000/root/qiyewechatApp

ymall/src/main/java/com/liangjian11/ymall/handle/SynProfitHandle.java

@@ -585,6 +585,8 @@ public class SynProfitHandle {
    * @return ProfitRuleDetail
    */
   private ProfitRuleDetail getRuleDetail(List<ProfitRuleDetail> rules, PrescriptionOrders order) {
+    if(!order.getDrugsJson().substring(0,1).equals("["))
+      order.setDrugsJson("["+order.getDrugsJson()+"]");
     JSONArray drugs = JSONArray.parseArray(order.getDrugsJson());
     JSONObject item;
     BigDecimal totalPrice = new BigDecimal("0");

ymall/src/main/resources/application-pgprodtest.properties

@@ -0,0 +1,94 @@
+logging.file= D:/log/logYmall.log
+
+spring.datasource.driver-class-name= org.postgresql.Driver
+spring.datasource.url= jdbc:postgresql://219.128.77.86:5433/ymall
+spring.datasource.username= dbuser
+spring.datasource.password= postgres#lj360.com@2019@#
+
+spring.druid.initialSize= 5
+spring.druid.minIdle= 5
+spring.druid.maxActive= 20
+spring.druid.maxWait= 60000
+spring.druid.timeBetweenEvictionRunsMillis= 60000
+spring.druid.minEvictableIdleTimeMillis= 300000
+spring.druid.validationQuery= SELECT 1
+spring.druid.testWhileIdle= true
+spring.druid.testOnBorrow= false
+spring.druid.testOnReturn= false
+spring.druid.poolPreparedStatements= true
+spring.druid.maxPoolPreparedStatementPerConnectionSize= 20
+spring.druid.filters= stat,wall,slf4j
+spring.druid.connectionProperties= druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+#\u670D\u52A1\u540D
+spring.application.name = ymPZC
+
+# \u6587\u4EF6\u5B58\u653E\u8DEF\u5F84
+resource.Locations= D:\\public\\
+resource.href= /public/
+#project.weburl= http://192.168.10.91:8070
+project.weburl= https://mem.360lj.com/mp
+
+# \u5916\u7F51\u8BBF\u95EE\u57DF\u540D
+domain.ymall= https://mem.360lj.com/ymp1
+# mp\u8BBF\u95EE\u57DF\u540D
+domain.mp= https://mem.360lj.com/ymp1
+# \u4E91\u5065\u5EB7\u7F51\u5173
+#domain.mpcpzuul= http://192.168.50.32:13001
+domain.mpcpzuul= http://mem.360lj.com:13000
+
+# \u91CD\u5B9A\u5411\u8DEF\u5F84
+#ymall.appid= wx4f8c9fef3896ad71
+#ymall.secret= ea186d9f2941b5cd88004e339a4ec479
+ymall.appid= wxa9fef05eee8dae34
+ymall.secret= b7c3b15b2933dce80135b39a7d366832
+ymall.path.fillInfo= https://mem.360lj.com/uip/#/doctorRegister
+ymall.path.doctorFlow= https://mem.360lj.com/uip/#/doctorFlow
+ymall.path.personalInfo= https://mem.360lj.com/uip/#/doctorMine
+ymall.path.queryExpress= https://m.360lj.com/nhome/express
+ymall.path.guideFlow= https://mem.360lj.com/uip/#/h5Flow
+ymall.path.activityhelpPage= https://mem.360lj.com/uip/#/friendsHelp
+ymall.path.activityIndex= https://mem.360lj.com/uip/#/myHelp
+ymall.path.specialist= https://mem.360lj.com/uip/#/specialist
+ymall.path.shortVideo=https://mem.360lj.com/uip/#/shortVideo
+ymall.path.selectRoles= https://mem.360lj.com/uip/#/selectRoles
+ymall.path.signUp= https://mem.360lj.com/uip/#/SignUp
+ymall.path.doctorDeactivation= https://mem.360lj.com/uip/#/doctorMine
+ymall.path.doctorToBeCertified= https://mem.360lj.com/uip/#/doctorFlow
+ymall.path.doctorHome= https://mem.360lj.com/uip/#/DoctorHome
+ymall.path.partnerDeactivation= https://mem.360lj.com/uip/#/PartnerDeactivation
+ymall.path.partnerToBeCertified= https://mem.360lj.com/uip/#/PartnerToBeCertified
+ymall.path.partnerHome= https://mem.360lj.com/uip/#/PartnerHome
+ymall.path.noFollow= https://mem.360lj.com/uip/#/NoFollow
+ymall.path.myProfitIndex= https://mem.360lj.com/uip/#/MyProfitIndex
+ymall.path.frontHost= https://mem.360lj.com/uip
+
+
+#\u5C0F\u7A0B\u5E8Fappid\u548C\u5BC6\u94A5
+ymall.miniappid= wxa9fef05eee8dae34
+ymall.minisecret= b7c3b15b2933dce80135b39a7d366832
+
+
+# \u8C03\u7528\u5176\u4ED6\u670D\u52A1
+ymall.hprose.sendMsg= http://sms.360lj.com/HproseWeb.aspx/
+#ymall.hprose.enAndDecode= http://t-hprose.360lj.com/EncryptionAlgorithm/
+ymall.hprose.enAndDecode= http://hprose.360lj.com/EncryptionAlgorithm/
+
+#spring cloud eureka
+eureka.client.service-url.defaultZone = http://liangjian:360lj.comOauth2passwd@192.168.50.32:11002/eureka/
+# \u4F7F\u7528ip\u5730\u5740\u6CE8\u518C\u5230eureka server
+eureka.instance.ip-address = true
+eureka.instance.instance-id = ${spring.cloud.client.ipAddress}:${server.port}
+
+# \u4E92\u8054\u7F51\u533B\u9662
+internetHospital.domainName= https://mem.360lj.com/hospital8088
+internetHospital.appkey= e9bd38dba82b479bab61a7721eb9e180
+internetHospital.appsecret= e5a3a0bd87304b1e8086ed1ded5b833a
+internetHospital.appid= 1
+
+# cron\u8868\u8FBE\u5F0F\uFF0C\u533B\u751F\u5BA1\u6838\u4FE1\u606F\u63D0\u9192\uFF0C0 0 5 29 2 ?
+cron.doctorRegister01= 0 0 5 29 2 ?
+cron.doctorRegister02= 0 0 0 29 2 ?
+# \u624B\u673A\u53F7,\u533B\u751F\u5BA1\u6838\u4FE1\u606F\u63D0\u9192\uFF0C\u591A\u4E2A\u7528,\u9694\u5F00
+phone.doctorRegister= 15207700220
+