YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by mingdan.ge
Commit 0efdf1cc59f3256bcbea2fcbff6b5c96539790c3 2 parents 935b8cef 443a3c46

no message

Inline Side-by-side
Showing 4 changed files with 36 additions and 153 deletions
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
37 from union_share_user usu 37 from union_share_user usu
38 <if test="identityStatus != null"> 38 <if test="identityStatus != null">
39 left join union_share_user_identity_card usui on usu.uid = usui.uid 39 left join union_share_user_identity_card usui on usu.uid = usui.uid
  40 + and usui.id =(select max(id) from union_share_user_identity_card where uid = usu.uid)
40 </if> 41 </if>
41 where usu.status=1 42 where usu.status=1
42 <if test="uid!=null" > 43 <if test="uid!=null" >
@@ -49,18 +50,23 @@ @@ -49,18 +50,23 @@
49 and usu.special_status = #{specialStatus,jdbcType=INTEGER} 50 and usu.special_status = #{specialStatus,jdbcType=INTEGER}
50 </if> 51 </if>
51 <if test="identityStatus != null" > 52 <if test="identityStatus != null" >
52 - and usui.status = #{identityStatus,jdbcType=INTEGER}  
53 - and usui.status = 1 53 + <if test="identityStatus == 1">
  54 + and usui.status = #{identityStatus,jdbcType=INTEGER}
  55 + </if>
  56 + <if test="identityStatus == 0">
  57 + and usui.status = #{identityStatus,jdbcType=INTEGER} or usui.status is null
  58 + </if>
54 </if> 59 </if>
55 </select> 60 </select>
56 <select id="selectByCondition" resultType="com.yoho.service.model.union.response.UnionShareUserRspBo" parameterType="com.yoho.service.model.union.request.UnionShareUserReqBO" > 61 <select id="selectByCondition" resultType="com.yoho.service.model.union.response.UnionShareUserRspBo" parameterType="com.yoho.service.model.union.request.UnionShareUserReqBO" >
57 - select id, uid, union_type unionType, update_time updateTime,create_time createTime,status,apply_id applyId,special_status specialStatus,cps_activity_id cpsActivityId 62 + select usu.id, usu.uid, usu.union_type unionType, usu.update_time updateTime,usu.create_time createTime,usu.status,usu.apply_id applyId,usu.special_status specialStatus,usu.cps_activity_id cpsActivityId
58 <if test="identityStatus != null"> 63 <if test="identityStatus != null">
59 ,usui.status as identityStatus 64 ,usui.status as identityStatus
60 </if> 65 </if>
61 from union_share_user usu 66 from union_share_user usu
62 <if test="identityStatus != null"> 67 <if test="identityStatus != null">
63 left join union_share_user_identity_card usui on usu.uid = usui.uid 68 left join union_share_user_identity_card usui on usu.uid = usui.uid
  69 + and usui.id =(select max(id) from union_share_user_identity_card where uid = usu.uid)
64 </if> 70 </if>
65 where usu.status=1 71 where usu.status=1
66 <if test="uid != null" > 72 <if test="uid != null" >
@@ -73,8 +79,12 @@ @@ -73,8 +79,12 @@
73 and usu.special_status = #{specialStatus,jdbcType=INTEGER} 79 and usu.special_status = #{specialStatus,jdbcType=INTEGER}
74 </if> 80 </if>
75 <if test="identityStatus != null" > 81 <if test="identityStatus != null" >
76 - and usui.status = #{identityStatus,jdbcType=INTEGER}  
77 - and usui.status = 1 82 + <if test="identityStatus == 1">
  83 + and usui.status = #{identityStatus,jdbcType=INTEGER}
  84 + </if>
  85 + <if test="identityStatus == 0">
  86 + and usui.status = #{identityStatus,jdbcType=INTEGER} or usui.status is null
  87 + </if>
78 </if> 88 </if>
79 order by usu.create_time desc 89 order by usu.create_time desc
80 limit #{start},#{size} 90 limit #{start},#{size}
@@ -1646,7 +1646,20 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport @@ -1646,7 +1646,20 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
1646 if (CollectionUtils.isNotEmpty(unionShareSettlementList)){ 1646 if (CollectionUtils.isNotEmpty(unionShareSettlementList)){
1647 DecimalFormat df1 = new DecimalFormat("0.00"); 1647 DecimalFormat df1 = new DecimalFormat("0.00");
1648 for (UnionShareSettlement unionShareSettlement : unionShareSettlementList){ 1648 for (UnionShareSettlement unionShareSettlement : unionShareSettlementList){
1649 - unionShareSettlement.setSettlementAmountStr("+"+df1.format(unionShareSettlement.getSettlementAmount())); 1649 + //提现总金额：¥688
  1650 + unionShareSettlement.setSettlementAmountStr("¥"+df1.format(unionShareSettlement.getSettlementAmount()));
  1651 + if(unionShareSettlement.getTaxAmount()!=null && unionShareSettlement.getAfterTaxAmount()!=null){
  1652 + //税后总收益：¥619.2
  1653 + unionShareSettlement.setAfterTaxAmountStr("¥"+df1.format(unionShareSettlement.getAfterTaxAmount()));
  1654 + //扣税总金额：¥68.8(10%)
  1655 + BigDecimal taxRatio = unionShareSettlement.getAfterTaxAmount()
  1656 + .divide(unionShareSettlement.getSettlementAmount(), 2, BigDecimal.ROUND_HALF_UP)
  1657 + .multiply(new BigDecimal(100))
  1658 + .setScale(0, BigDecimal.ROUND_HALF_UP);
  1659 + unionShareSettlement.setTaxAmountStr("¥"+df1.format(unionShareSettlement.getTaxAmount())
  1660 + + "(" + taxRatio + "%)");
  1661 + }
  1662 +
1650 unionShareSettlement.setSettlementTimeStr(DateUtils.int2DateStr(unionShareSettlement.getSettlementTime(), DateUtils.POINT_FOMARTPATTER)); 1663 unionShareSettlement.setSettlementTimeStr(DateUtils.int2DateStr(unionShareSettlement.getSettlementTime(), DateUtils.POINT_FOMARTPATTER));
1651 if (unionShareSettlement.getStatus() == 1){ 1664 if (unionShareSettlement.getStatus() == 1){
1652 unionShareSettlement.setSettlementStatus("处理中"); 1665 unionShareSettlement.setSettlementStatus("处理中");
@@ -131,11 +131,10 @@ @@ -131,11 +131,10 @@
131 width: 200, 131 width: 200,
132 align: "center", 132 align: "center",
133 formatter: function (value, rowData, rowIndex) { 133 formatter: function (value, rowData, rowIndex) {
134 - if(value == 0) {  
135 - return "未上传";  
136 - }  
137 if(value == 1) { 134 if(value == 1) {
138 return "已上传"; 135 return "已上传";
  136 + }else{
  137 + return "未上传";
139 } 138 }
140 } 139 }
141 }, { 140 }, {
@@ -165,7 +164,7 @@ @@ -165,7 +164,7 @@
165 str += "<a role='pass' dataId='" + rowData.id + "' style='margin-left:10px'>开通锁粉</a>"; 164 str += "<a role='pass' dataId='" + rowData.id + "' style='margin-left:10px'>开通锁粉</a>";
166 165
167 } 166 }
168 - str = "<a role='userIdentity' dataId='" + rowData.uid + "' style='margin-left:10px'>身份信息</a>"; 167 + str = "<a role='userIdentity' dataId='" + rowData.uid + "' style='margin-left:10px'>身份信息驳回</a>";
169 return str; 168 return str;
170 } 169 }
171 } 170 }
@@ -191,26 +190,6 @@ @@ -191,26 +190,6 @@
191 iconCls: "icon-more", 190 iconCls: "icon-more",
192 onClick: function () { 191 onClick: function () {
193 var uid=$(this).attr("dataId"); 192 var uid=$(this).attr("dataId");
194 - userIdentity(uid);  
195 - }  
196 - });  
197 -  
198 - }  
199 - });  
200 - function userIdentity(uid) {  
201 - var div = $("<div>").appendTo($(window.self.document.body));  
202 - window.self.$(div).myDialog({  
203 - modal : true,  
204 - collapsible : true,  
205 - cache : false,  
206 - title : "身份信息",  
207 - width: 690,  
208 - height: 600,  
209 - href: contextPath + "/html/unionshare/userIdentity.html?uid="+uid,  
210 - buttons : [{  
211 - text : "驳回",  
212 - iconCls : "icon-save",  
213 - handler : function() {  
214 var param = {}; 193 var param = {};
215 param.uid = uid; 194 param.uid = uid;
216 $.ajax({ 195 $.ajax({
@@ -222,7 +201,6 @@ @@ -222,7 +201,6 @@
222 success: function(result) { 201 success: function(result) {
223 if(result.data){ 202 if(result.data){
224 window.self.$.messager.alert("提示消息","操作成功"); 203 window.self.$.messager.alert("提示消息","操作成功");
225 - window.self.$(div).dialog('close');  
226 }else { 204 }else {
227 window.self.$.messager.alert("操作失败",result.message); 205 window.self.$.messager.alert("操作失败",result.message);
228 } 206 }
@@ -230,16 +208,10 @@ @@ -230,16 +208,10 @@
230 } 208 }
231 }); 209 });
232 } 210 }
233 - },{  
234 - id : "closeBtn",  
235 - text : "关闭",  
236 - iconCls : "icon-cancel",  
237 - handler : function() {  
238 - window.self.$(div).dialog('close');  
239 - }  
240 - }]  
241 - });  
242 - } 211 + });
  212 +
  213 + }
  214 + });
243 function resetSelectedCheckBox(data){ 215 function resetSelectedCheckBox(data){
244 $("input[type='checkbox'][name='id']").each(function () { 216 $("input[type='checkbox'][name='id']").each(function () {
245 var cb=$(this); 217 var cb=$(this);
1 -<!DOCTYPE html>  
2 -<html>  
3 -<head>  
4 - <meta charset="UTF-8" />  
5 - <title>Yoho!Buy运营平台</title>  
6 - <script src="/union/js/include.js"></script>  
7 - <style>  
8 -  
9 - .row-input {  
10 - width:95%;  
11 - heigth: 40px;  
12 - line-height: 40px;  
13 - margin-top:15px;  
14 - font-size: 16px;  
15 - display: block;  
16 - }  
17 -  
18 - .row-input .row-left {  
19 - padding-left: 22px;  
20 - width: 100px;  
21 - display: block;  
22 - float: left;  
23 - }  
24 -  
25 - .row-input .row-right {  
26 - width: auto;  
27 - display: inline-block;  
28 - }  
29 -  
30 - </style>  
31 -<script>  
32 -function getQueryString(url,name) {  
33 - var i=url.lastIndexOf('?');  
34 - if(i==-1)return;  
35 - var querystr=url.substr(i+1);  
36 - var arr1=querystr.split('&');  
37 - var arr2=new Object();  
38 - for (i in arr1){  
39 - var ta=arr1[i].split('=');  
40 - arr2[ta[0]]=ta[1];  
41 - }  
42 - return arr2[name];  
43 -}  
44 -</script>  
45 -</head>  
46 -<body class="easyui-layout" fit="true">  
47 - <div region="north" style="height: 100px; border-bottom: 0;">  
48 - <script>  
49 - document.write(addHead('CPS联盟管理', 'CPS消息管理'));  
50 - </script>  
51 - </div>  
52 - <div region="center" style="margin: 10px;border: 1px solid #D7D7D7;">  
53 - <form id="activityEditForm" name="activityEditForm" method="post">  
54 - <div class="row-input">  
55 - <div class="row-left">  
56 - 真实姓名：  
57 - </div>  
58 - <div class="row-right">  
59 - <div id="name" name="name" style="width:500px"></div>  
60 - </div>  
61 - </div>  
62 - <div class="row-input">  
63 - <div class="row-left">  
64 - 是否上传：  
65 - </div>  
66 - <div class="row-right">  
67 - <div id="identityStatus"></div>  
68 - </div>  
69 - </div>  
70 - <div class="row-input">  
71 - <div class="row-left">  
72 - 身份照片：  
73 - </div>  
74 - </div>  
75 - <div class="row-input">  
76 - <div id="imageLeft"></div>  
77 - <div id="imageRight"></div>  
78 - </div>  
79 - </form>  
80 -  
81 - </div>  
82 -<script>  
83 - function initForm(){  
84 - var param=window.location.search;  
85 - var uid = getQueryString(param, "uid");  
86 - $.post(contextPath + "/UnionShareRest/getIdentityCard", {  
87 - uid : uid  
88 - }, function(data) {  
89 - if (data.code == 200) {  
90 - $("#name").html(data.data.name);  
91 - if(data.data.status == 1){  
92 - $("#identityStatus").html("未上传");  
93 - }else if(data.data.status == 0){  
94 - $("#identityStatus").html("已上传");  
95 - }  
96 - $("#imageLeft").html("<a src='"+data.data.cardFrontUrl+"'></a>");  
97 - $("#imageRight").html("<a src='"+data.data.cardBackUrl+"'></a>");  
98 - }else {  
99 - window.self.$.messager.alert("失败", "失败！", "error");  
100 - }  
101 - });  
102 - }  
103 -  
104 - $(function () {  
105 - initForm();  
106 - });  
107 -  
108 -  
109 -</script>  
110 -</body>  
111 -  
112 -</html>