From eb5219332e5040c4760b0a3e09e2af5487bbe410 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Wed, 4 Nov 2020 10:02:59 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AD=BE=E7=BA=A6?= =?UTF-8?q?=E5=90=8E=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/custom/service/impl/SysContractServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java index 7954d9937..077ac244f 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java @@ -105,7 +105,7 @@ public class SysContractServiceImpl implements ISysContractService { // String templatePath = "/Users/wonder/Documents/Workspaces/java/RuoYi-Vue/running/pdf/contract.pdf"; // String filePath = "/Users/wonder/Documents/Workspaces/java/RuoYi-Vue/running" + sysContract.getPath(); String templatePath = "/home/workspace/RuoYi-Vue/running/pdf/contract.pdf"; - String filePath = "/home/www/web/long.busyinn.com" + sysContract.getPath(); + String filePath = "/home/web/sign.shengtangdiet.com" + sysContract.getPath(); PdfReader reader; FileOutputStream out; From 2a13775aa4d18c17ff67dbb7a22df8193435bf57 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Wed, 4 Nov 2020 10:06:33 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AD=BE=E7=BA=A6?= =?UTF-8?q?=E5=90=8E=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/custom/service/impl/SysContractServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java index 077ac244f..de08a3f64 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java @@ -105,7 +105,7 @@ public class SysContractServiceImpl implements ISysContractService { // String templatePath = "/Users/wonder/Documents/Workspaces/java/RuoYi-Vue/running/pdf/contract.pdf"; // String filePath = "/Users/wonder/Documents/Workspaces/java/RuoYi-Vue/running" + sysContract.getPath(); String templatePath = "/home/workspace/RuoYi-Vue/running/pdf/contract.pdf"; - String filePath = "/home/web/sign.shengtangdiet.com" + sysContract.getPath(); + String filePath = "/home/web/manage.shengtangdiet.com" + sysContract.getPath(); PdfReader reader; FileOutputStream out; From 3de52c82ee57c0cd5767cb5907306241823c2d54 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Wed, 4 Nov 2020 10:11:44 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/custom/signContract/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/views/custom/signContract/index.vue b/ruoyi-ui/src/views/custom/signContract/index.vue index 6939682d6..58ac341a9 100644 --- a/ruoyi-ui/src/views/custom/signContract/index.vue +++ b/ruoyi-ui/src/views/custom/signContract/index.vue @@ -51,14 +51,16 @@

第二条 合作内容及费用

11、经甲乙双方协商确定，乙方向甲方购买 {{form.serveTimeStr}} “胜唐体控瘦身指导服务”（以下简称服务）。
-
12、乙方向甲方购买 {{form.serveTimeStr}} ，经甲乙双方协商确定，乙方向甲方支付疗程费用共为人民币：{{form.amount}} 元，大写：{{form.amountUpper}}）。 +
12、乙方向甲方购买 {{form.serveTimeStr}} + ，经甲乙双方协商确定，乙方向甲方支付疗程费用共为人民币：{{form.amount}} 元，大写：{{form.amountUpper}}）。

第三条 服务期约定

1、服务时间阶段（服务指导期、服务跟踪期、免费咨询期）具体安排，由甲方根据乙方的实际情况与乙方协商确定。
2、因不可抗拒的因素（如意外怀孕等）而暂停服务指导，其后续服务期限由甲乙方协商确定。
-
3、减肥需要双方的配合，在不是甲方技术问题的情况下，乙方不执行营养师的指导导致没有达到预期效果，责任由乙方承担。根据个人体质不同，在调理营养健康的前提下，健康吃瘦 {{form.servePromise}} 斤 +
3、减肥需要双方的配合，在不是甲方技术问题的情况下，乙方不执行营养师的指导导致没有达到预期效果，责任由乙方承担。根据个人体质不同，在调理营养健康的前提下，健康吃瘦 {{form.servePromise}} + 斤
4、乙方应按甲方制定的饮食方案来饮食，承诺在未与甲方沟通前，不擅自吃方案之外的高热量、高油、高盐、高糖等不利于健康和减脂的饮食，服务期内擅自暴食导致体重上涨，次数超过3次视为乙方主动放弃营养减脂，且甲方无需免费延长服务时间。 @@ -197,6 +199,7 @@ submitForm() { this.$refs["form"].validate(valid => { if (valid) { + this.form.name = this.form.cusName; signContract(this.form).then(result => { if (result.code === 200) { window.location.href = window.location.origin + result.url; From 6796e1b36e2c19ae53b6befe5ba2ddeed067b704 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Wed, 4 Nov 2020 10:13:17 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/custom/signContract/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/custom/signContract/index.vue b/ruoyi-ui/src/views/custom/signContract/index.vue index 58ac341a9..e84b10385 100644 --- a/ruoyi-ui/src/views/custom/signContract/index.vue +++ b/ruoyi-ui/src/views/custom/signContract/index.vue @@ -35,7 +35,7 @@ center>

甲方：胜唐体控（深圳市胜唐科技有限公司）

-

乙方：{{form.name}}

+

乙方：{{form.cusName}}

甲乙双方本着诚信合作、互惠互利的原则，依据中华人民共和国有关法律，经友好协商，现就胜唐体控减肥咨询指导服务合作相关事宣达成一致协议，以兹共同遵守。 如果需要减脂的乙方未成年，由应由乙方法定监护人代签本合同，乙方享受同等法律权益。

From 915fdd69172ad6e23cc5d12452a46289e1ffe4fb Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Wed, 4 Nov 2020 21:36:17 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 ++- running/pdf/contract.pdf | Bin 239853 -> 247691 bytes .../service/impl/SysContractServiceImpl.java | 6 ++-- ruoyi-ui/src/views/custom/contract/index.vue | 30 +++++++++--------- .../src/views/custom/signContract/index.vue | 1 - 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index bea1d84ae..6f0f72ac3 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,6 @@ nbdist/ !*/build/*.java !*/build/*.html !*/build/*.xml -running/* \ No newline at end of file +running/file/* +running/logs/* +running/uploadPath/* \ No newline at end of file diff --git a/running/pdf/contract.pdf b/running/pdf/contract.pdf index 36bdf9099000d8f76228e3f5a1d89464af5909e7..2252b3039570dbc366ce049aa64899bb8c467c50 100644 GIT binary patch delta 17708 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

Er=X+N4TKU|P755*ZpqKQ>iwjvF^=!K=z#85V6 zMT#eX4^5RR*`Q@b6A7@1?I3EzT=unVUSteeT%Ys=$E%WjjNFd*^tgChi+wzJ+_y}= zFL93eFf{MQPs#V*g*~H_H+x8iFP~;Wb zo%3=5K4rV|UUJZ%TKPoUeTQ<3zDPJzU%avc<%xP=HLdB+)S%D-tGtqKT~kysg`oI; zmt)FbMK|(_q5CB;e|r}%ZL%#YD}km5-ou*!yN>ll)19 zw~L<^4kb8$q+vb~mR^+FRJz~{X>s6dC)&a{aOcAlwxA(GXqPqK9)dUKCrrHGlx^#l z1{n{%zuakM)dqP(mUxgL4BeqhW*RM1{e3<8TUk!WtOic}m-i~hx*j_;#gAwTaj?pYINM2}%Mt*NUE7o`P*l~0$L&fc?z(6ziMYkFW zW?A360==s?c-{$o9Y)`uuwz$}up|XinFmax6(w&v2<2#r?>#kTcHnGMfeD;ATkZCh zo^5s`Qr*}_eBmFS%Hfm+N;bx8e|vM5fr%2@&&{0pORTX$WGZ;}u8p+^yqR?TYWL^KS%3>T50y5Co{RhjgbID!-Q*)!w|3A!hF5{87^f2UZkd zV+I^z$j5t%F)^UvY#5KfrK9}rvv|}0V5iO0Ij~42*FsOxAtqVnoYTi-EYw9oN>W7_ z99I6;t26vSFNFKM?iDu~K}@}A&_UpAdULqGGo_9&x~o=^>#V^KQ2IVegO1}lk{8{q zt{rk{H@cvvSe1>Tv?03+2#O(Bn^ju=8_uY1%pJgg4)a3^^_C*tv|PzM zV;I%Y9n3vH=rXm-_XC^qLDYrq9iyPjlDqudey9VT&~7rfb@nfq1SoOx$0{EW?aGWo&guM$8_d4X%=)lJm8&cVR z%zQqPZgM4eOO|^5Ui@{pY6ZbxqM7NVQn|u$lmNw%7NvX{{D9j+bkqX@Lo@oep9AVa z3UF1eQ+m#s93F*ciFN&+!bQjL&67YpQUapJ{Gsw1J*(T&6*lc<85^v#pL>gBc^T5N zKB@jN6@%5QPsbPxW!^=*2?B@fn$Rw4SPWeb%zj1=Q}D~*RD-38*}_!C;m?sSl%|h~ zTLi$Wh2%J>!J=fxV1vR)cD@)F#Y{H_pU?=r0je&Vk)moB*iv$o;^`L&_ZTC?<_O6dfkA_O zdc!@HcXrHjv{Z4zk%@jqwEMYI^oQQxkJn$$ZsIzn7jKg{i|P`elj@cl>ndMMMP`B^ zB453p*OK9VZ~MI071>WQ0p1!2inmEOBGv9tCzAB>kc)#)_5`Neh4PonIxkQ&L3mNvp z0k>8ae;K|y13xn<_`QoiP})%1vbPZ_F4djiYWr|~RJ4-BX@q-bghU?Qe&_77PUjpi zc0nI`a})f$Ancqv`0nt#J1^#dEJ4zbFO=ug+#4IK`ogPSiKiF#TDR~flk<=b^_SXp z$131eZO$O`fvNxXt^F*MWIWWp22147z~kaTXlb zmm}3HGwt*9Ch68L$2gkiSsjlxEzC79l1n0|ud&8SZp;pC!tAf_hNuOhZWVN_JKjdy zbU`!;GAw-dU~8eku0AI7NM8nvF6(74S%|B>6*@-&<5wnKyaNF67mPMYsOtZ*u@*%6)-xP>8`qXaSE0oR(%=sX$9&r{-hsVH)v>7XFx0& z;j`w)yTWg{W2$jmflK&U!pZvTGJ4<(x(Df7=|$5YDp2b&@J_%N7!#}44H^cm2yX_K zoy9<+UG|}m>^(jVq;^hik&#huSJ5Qk1BKhYL@vIYa97b_nfuqgsZ^~bcol+GkHUYN zbX>@{P4}gO{`+uLVazYko4CrD?(T@f{JA2pAH@k0WmiiO4o&_v=hDDZz~GgVb6x?> zN-87MBw?=qj-J3ys+ey6;;TC>>sM$l1?qm{8xOUeY%ZzX1hyHa-6EvIj6y?L>dX^a zwovjNb;N#R0Cp(ywhr#W*4?2!pg0{b6fg3hq}{#Wew+_Ps}hp-0Fd+FFlW&BqR56z zl1LdQT9xQZYoy^GmcO8qr#1;-GEpJ#PLbD|3FN{_-FO z2r1G{-lJ1#p5wSC7|%6bH^MxCxOL8CS3XXF74OsA0pHA%qSVs3!c+xDd8X9X>;mR^ zRwn6pW-%QL*;tw>YO)!<=bih(a^-&WI%o+%-w`d=rwA97!klV+Hy1hKG-Jm4m|(ck zP=UwT?gVyMO#=W#T)`ZlW=AK9lT23g7J`lVTc9^%v~zM7y!!qdbTkYVc0$84C}(uJpXn#*@AQq|FE(hhHJx!*EJguouF%V!~Ont-CIzfg5(H zsnRj@ud&)%B&#nat1dB7z3M2zjdrA!^jJM=v$FNo4GWU{UK>MS$uSsgNJ>i!_R|Dm ze=D!Vz`Zz7&1#Z)yIN+Nwa$y~haih4>{EJx11H^$O zh795x7*)1b@~@=dtwo8w&iy;81@6Q@C)y5Ldv)qmJjh)2cwPo<6zLxp^>Pda`^+Iu z)n0A6cYw1pPiA3<=kokNeN^ybUT?VefK^}Z@9>!im$IS)^En&f2I~W9ayv^sl^*

4sx37Qiw!(v3 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 Nak;re=o(?L{tu)NZU_JX diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java index e10334804..082645e1d 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java @@ -123,9 +123,9 @@ public class SysContractServiceImpl implements ISysContractService { form.addSubstitutionFont(BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED)); - form.setField("name", sysContract.getName(), true); - form.setField("time", sysContract.getServeTimeStr(), true); - form.setField("tutor", sysContract.getServeTimeStr(), true); + form.setField("signName", sysContract.getSignName(), true); + form.setField("serveTime", sysContract.getServeTimeStr(), true); + form.setField("tutor", sysContract.getTutor(), true); form.setField("moneyUpper", sysContract.getAmountUpper(), true); form.setField("money", sysContract.getAmount().intValue() + "", true); form.setField("phone", sysContract.getPhone(), true); diff --git a/ruoyi-ui/src/views/custom/contract/index.vue b/ruoyi-ui/src/views/custom/contract/index.vue index 9ab690b35..3ea20267b 100644 --- a/ruoyi-ui/src/views/custom/contract/index.vue +++ b/ruoyi-ui/src/views/custom/contract/index.vue @@ -200,7 +200,7 @@