Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-bean/src/main/java/com/java110/dto/accountWithdrawalApply/AccountWithdrawalApplyDto.java

@@ -0,0 +1,97 @@
+package com.java110.dto.accountWithdrawalApply;
+
+import com.java110.dto.PageDto;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 账户提现数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class AccountWithdrawalApplyDto extends PageDto implements Serializable {
+
+    private String applyId;
+private String applyUserName;
+private String amount;
+private String context;
+private String acctId;
+private String state;
+private String applyUserTel;
+private String applyUserId;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getApplyId() {
+        return applyId;
+    }
+public void setApplyId(String applyId) {
+        this.applyId = applyId;
+    }
+public String getApplyUserName() {
+        return applyUserName;
+    }
+public void setApplyUserName(String applyUserName) {
+        this.applyUserName = applyUserName;
+    }
+public String getAmount() {
+        return amount;
+    }
+public void setAmount(String amount) {
+        this.amount = amount;
+    }
+public String getContext() {
+        return context;
+    }
+public void setContext(String context) {
+        this.context = context;
+    }
+public String getAcctId() {
+        return acctId;
+    }
+public void setAcctId(String acctId) {
+        this.acctId = acctId;
+    }
+public String getState() {
+        return state;
+    }
+public void setState(String state) {
+        this.state = state;
+    }
+public String getApplyUserTel() {
+        return applyUserTel;
+    }
+public void setApplyUserTel(String applyUserTel) {
+        this.applyUserTel = applyUserTel;
+    }
+public String getApplyUserId() {
+        return applyUserId;
+    }
+public void setApplyUserId(String applyUserId) {
+        this.applyUserId = applyUserId;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

java110-bean/src/main/java/com/java110/po/accountWithdrawalApply/AccountWithdrawalApplyPo.java

@@ -0,0 +1,74 @@
+package com.java110.po.accountWithdrawalApply;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class AccountWithdrawalApplyPo implements Serializable {
+
+    private String applyId;
+private String applyUserName;
+private String amount;
+private String context;
+private String acctId;
+private String statusCd = "0";
+private String state = "486";
+private String applyUserTel;
+private String applyUserId;
+public String getApplyId() {
+        return applyId;
+    }
+public void setApplyId(String applyId) {
+        this.applyId = applyId;
+    }
+public String getApplyUserName() {
+        return applyUserName;
+    }
+public void setApplyUserName(String applyUserName) {
+        this.applyUserName = applyUserName;
+    }
+public String getAmount() {
+        return amount;
+    }
+public void setAmount(String amount) {
+        this.amount = amount;
+    }
+public String getContext() {
+        return context;
+    }
+public void setContext(String context) {
+        this.context = context;
+    }
+public String getAcctId() {
+        return acctId;
+    }
+public void setAcctId(String acctId) {
+        this.acctId = acctId;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getState() {
+        return state;
+    }
+public void setState(String state) {
+        this.state = state;
+    }
+public String getApplyUserTel() {
+        return applyUserTel;
+    }
+public void setApplyUserTel(String applyUserTel) {
+        this.applyUserTel = applyUserTel;
+    }
+public String getApplyUserId() {
+        return applyUserId;
+    }
+public void setApplyUserId(String applyUserId) {
+        this.applyUserId = applyUserId;
+    }
+
+
+
+}

java110-db/src/main/resources/mapper/acct/AccountWithdrawalApplyServiceDaoImplMapper.xml

@@ -0,0 +1,142 @@
+<?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">
+<mapper namespace="accountWithdrawalApplyServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存账户提现信息 add by wuxw 2018-07-03 -->
+    <insert id="saveAccountWithdrawalApplyInfo" parameterType="Map">
+        insert into account_withdrawal_apply(
+apply_id,apply_user_name,amount,context,acct_id,state,apply_user_tel,apply_user_id
+) values (
+#{applyId},#{applyUserName},#{amount},#{context},#{acctId},#{state},#{applyUserTel},#{applyUserId}
+)
+    </insert>
+
+
+
+    <!-- 查询账户提现信息 add by wuxw 2018-07-03 -->
+    <select id="getAccountWithdrawalApplyInfo" parameterType="Map" resultType="Map">
+        select  t.apply_id,t.apply_id applyId,t.apply_user_name,t.apply_user_name applyUserName,t.amount,t.create_time,t.create_time createTime,t.context,t.acct_id,t.acct_id acctId,t.status_cd,t.status_cd statusCd,t.state,t.apply_user_tel,t.apply_user_tel applyUserTel,t.apply_user_id,t.apply_user_id applyUserId 
+from account_withdrawal_apply t 
+where 1 =1 
+<if test="applyId !=null and applyId != ''">
+   and t.apply_id= #{applyId}
+</if> 
+<if test="applyUserName !=null and applyUserName != ''">
+   and t.apply_user_name= #{applyUserName}
+</if> 
+<if test="amount !=null and amount != ''">
+   and t.amount= #{amount}
+</if> 
+<if test="createTime !=null and createTime != ''">
+   and t.create_time= #{createTime}
+</if> 
+<if test="context !=null and context != ''">
+   and t.context= #{context}
+</if> 
+<if test="acctId !=null and acctId != ''">
+   and t.acct_id= #{acctId}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="state !=null and state != ''">
+   and t.state= #{state}
+</if> 
+<if test="applyUserTel !=null and applyUserTel != ''">
+   and t.apply_user_tel= #{applyUserTel}
+</if> 
+<if test="applyUserId !=null and applyUserId != ''">
+   and t.apply_user_id= #{applyUserId}
+</if> 
+order by t.create_time desc
+<if test="page != -1 and page != null ">
+   limit #{page}, #{row}
+</if> 
+
+    </select>
+
+
+
+
+    <!-- 修改账户提现信息 add by wuxw 2018-07-03 -->
+    <update id="updateAccountWithdrawalApplyInfo" parameterType="Map">
+        update  account_withdrawal_apply t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="applyUserName !=null and applyUserName != ''">
+, t.apply_user_name= #{applyUserName}
+</if> 
+<if test="amount !=null and amount != ''">
+, t.amount= #{amount}
+</if> 
+<if test="createTime !=null and createTime != ''">
+, t.create_time= #{createTime}
+</if> 
+<if test="context !=null and context != ''">
+, t.context= #{context}
+</if> 
+<if test="acctId !=null and acctId != ''">
+, t.acct_id= #{acctId}
+</if> 
+<if test="state !=null and state != ''">
+, t.state= #{state}
+</if> 
+<if test="applyUserTel !=null and applyUserTel != ''">
+, t.apply_user_tel= #{applyUserTel}
+</if> 
+<if test="applyUserId !=null and applyUserId != ''">
+, t.apply_user_id= #{applyUserId}
+</if> 
+ where 1=1 <if test="applyId !=null and applyId != ''">
+and t.apply_id= #{applyId}
+</if> 
+
+    </update>
+
+    <!-- 查询账户提现数量 add by wuxw 2018-07-03 -->
+     <select id="queryAccountWithdrawalApplysCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from account_withdrawal_apply t 
+where 1 =1 
+<if test="applyId !=null and applyId != ''">
+   and t.apply_id= #{applyId}
+</if> 
+<if test="applyUserName !=null and applyUserName != ''">
+   and t.apply_user_name= #{applyUserName}
+</if> 
+<if test="amount !=null and amount != ''">
+   and t.amount= #{amount}
+</if> 
+<if test="createTime !=null and createTime != ''">
+   and t.create_time= #{createTime}
+</if> 
+<if test="context !=null and context != ''">
+   and t.context= #{context}
+</if> 
+<if test="acctId !=null and acctId != ''">
+   and t.acct_id= #{acctId}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="state !=null and state != ''">
+   and t.state= #{state}
+</if> 
+<if test="applyUserTel !=null and applyUserTel != ''">
+   and t.apply_user_tel= #{applyUserTel}
+</if> 
+<if test="applyUserId !=null and applyUserId != ''">
+   and t.apply_user_id= #{applyUserId}
+</if> 
+
+
+     </select>
+
+</mapper>

java110-generator/src/main/resources/newBack/template_1.json

@@ -1,35 +1,45 @@
 {
   "autoMove": true,
-  "id": "pfId",
-  "name": "reportOwnerPayFee",
-  "desc": "业主缴费明细",
-  "shareParam": "communityId",
-  "shareColumn": "community_id",
-  "shareName": "report",
-  "tableName": "report_owner_pay_fee",
+  "id": "applyId",
+  "name": "accountWithdrawalApply",
+  "desc": "账户提现",
+  "shareParam": "acctId",
+  "shareColumn": "acct_id",
+  "shareName": "acct",
+  "tableName": "account_withdrawal_apply",
   "param": {
-    "pfId": "pf_id",
-    "pfYear": "pf_year",
-    "pfMonth": "pf_month",
-    "pfDate": "pf_date",
-    "communityId": "community_id",
-    "ownerId": "owner_id",
-    "ownerName": "owner_name",
-    "objName": "obj_name",
-    "objType": "obj_type",
-    "objId": "obj_id",
-    "detailId": "detail_id",
-    "configId": "config_id",
-    "configName": "config_name",
-    "feeId": "fee_id",
-    "feeName": "fee_name",
+    "applyId": "apply_id",
+    "acctId": "acct_id",
     "amount": "amount",
+    "applyUserId": "apply_user_id",
+    "applyUserName": "apply_user_name",
+    "applyUserTel": "apply_user_tel",
+    "context": "context",
+    "state": "state",
+    "createTime": "create_time",
     "statusCd": "status_cd"
   },
   "required": [
     {
-      "code": "pfId",
-      "msg": "缴费ID不能为空"
+      "code": "acctId",
+      "msg": "账户ID不能为空"
+    },
+    {
+      "code": "amount",
+      "msg": "提现金额不能为空"
+    },
+    {
+      "code": "applyUserId",
+      "msg": "申请人ID不能为空"
+    },{
+      "code": "applyUserName",
+      "msg": "申请人名称不能为空"
+    },{
+      "code": "applyUserTel",
+      "msg": "申请人电话不能为空"
+    },{
+      "code": "state",
+      "msg": "申请状态不能为空"
     }
   ]
 }

java110-generator/src/main/resources/web/template_1.json

@@ -1,94 +1,84 @@
 {
-  "templateName":"金币设置",
-  "templateCode":"systemGoldSetting",
-  "templateKey":"settingId",
-  "templateKeyName":"设置ID",
-  "searchCode": "settingId",
-  "searchName": "设置ID",
-  "directories": "admin",
+  "templateName":"账户提现",
+  "templateCode":"accountWithdrawalApply",
+  "templateKey":"applyId",
+  "templateKeyName":"提现ID",
+  "searchCode": "applyId",
+  "searchName": "提现ID",
+  "directories": "acct",
   "conditions": [
     {
-      "name": "活动标题",
+      "name": "申请人名称",
       "inputType": "input",
-      "code": "title",
+      "code": "applyUserName",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "申请人电话",
+      "inputType": "input",
+      "code": "applyUserTel",
       "whereCondition": "equal"
     }
   ],
   "columns":[
     {
-      "code":"goldName",
-      "cnCode":"名称",
-      "desc":"必填，请填写名称",
+      "code":"amount",
+      "cnCode":"提现金额",
+      "desc":"必填，请填写提现金额",
       "required":true,
       "hasDefaultValue":false,
       "inputType":"input",
-      "limit":"maxin",
-      "limitParam":"1,64",
-      "limitErrInfo":"名称不能超过64位",
+      "limit":"money",
+      "limitParam":"",
+      "limitErrInfo":"提现金额格式错误",
       "show": true
     },
     {
-      "code": "goldType",
-      "cnCode":"类型",
+      "code": "applyUserId",
+      "cnCode":"申请人ID",
       "desc":"必填，请选择类型",
       "required":true,
       "hasDefaultValue":false,
-      "inputType": "select",
-      "selectValue":"1001",
-      "selectValueName":"普通金币",
+      "inputType": "input",
       "limit":"num",
       "limitParam":"",
       "limitErrInfo":"类型格式错误",
       "show": true
     },
     {
-      "code": "buyPrice",
-      "cnCode":"购买价格",
-      "desc":"必填，请填写购买金币价格",
+      "code": "applyUserName",
+      "cnCode":"申请人名称",
+      "desc":"必填，请填写申请人名称",
       "required":true,
       "hasDefaultValue":false,
       "inputType": "input",
-      "limit":"money",
-      "limitParam":"",
-      "limitErrInfo":"购买价格格式错误",
+      "limit":"maxin",
+      "limitParam":"1,20",
+      "limitErrInfo":"申请人名称不能超过20位",
       "show": true
     },
     {
-      "code": "usePrice",
-      "cnCode":"使用价格",
-      "desc":"必填，请填写使用价格",
+      "code": "applyUserTel",
+      "cnCode":"申请人电话",
+      "desc":"必填，请填写申请人电话",
       "required":true,
       "hasDefaultValue":false,
       "inputType": "input",
-      "limit":"money",
+      "limit":"phone",
       "limitParam":"",
-      "limitErrInfo":"使用价格格式错误",
+      "limitErrInfo":"申请人电话格式错误",
       "show": true
     },
     {
-      "code": "validity",
-      "cnCode":"有效期",
-      "desc":"必填，请填写有效期",
+      "code": "context",
+      "cnCode":"申请说明",
+      "desc":"请填写申请说明",
       "required":true,
       "hasDefaultValue":false,
       "inputType": "input",
-      "limit":"num",
-      "limitParam":"",
-      "limitErrInfo":"有效期必须为整数",
-      "show": true
-    },
-    {
-      "code": "state",
-      "cnCode":"状态",
-      "desc":"必填，请选择状态",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType": "select",
-      "selectValue":"001,002",
-      "selectValueName":"启用,停用",
       "limit":"maxLength",
-      "limitParam":"12",
-      "limitErrInfo":"状态格式错误",
+      "limitParam":"500",
+      "limitErrInfo":"申请说明不能超过500",
       "show": true
     }
   ]

java110-interface/src/main/java/com/java110/intf/acct/IAccountWithdrawalApplyInnerServiceSMO.java

@@ -0,0 +1,53 @@
+package com.java110.intf.acct;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.accountWithdrawalApply.AccountWithdrawalApplyDto;
+import com.java110.po.accountWithdrawalApply.AccountWithdrawalApplyPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @ClassName IAccountWithdrawalApplyInnerServiceSMO
+ * @Description 账户提现接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/accountWithdrawalApplyApi")
+public interface IAccountWithdrawalApplyInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveAccountWithdrawalApply", method = RequestMethod.POST)
+    public int saveAccountWithdrawalApply(@RequestBody AccountWithdrawalApplyPo accountWithdrawalApplyPo);
+
+    @RequestMapping(value = "/updateAccountWithdrawalApply", method = RequestMethod.POST)
+    public int updateAccountWithdrawalApply(@RequestBody  AccountWithdrawalApplyPo accountWithdrawalApplyPo);
+
+    @RequestMapping(value = "/deleteAccountWithdrawalApply", method = RequestMethod.POST)
+    public int deleteAccountWithdrawalApply(@RequestBody  AccountWithdrawalApplyPo accountWithdrawalApplyPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param accountWithdrawalApplyDto 数据对象分享
+     * @return AccountWithdrawalApplyDto 对象数据
+     */
+    @RequestMapping(value = "/queryAccountWithdrawalApplys", method = RequestMethod.POST)
+    List<AccountWithdrawalApplyDto> queryAccountWithdrawalApplys(@RequestBody AccountWithdrawalApplyDto accountWithdrawalApplyDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param accountWithdrawalApplyDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryAccountWithdrawalApplysCount", method = RequestMethod.POST)
+    int queryAccountWithdrawalApplysCount(@RequestBody AccountWithdrawalApplyDto accountWithdrawalApplyDto);
+}

service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java

@@ -0,0 +1,108 @@
+package com.java110.acct.api;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.acct.bmo.accountWithdrawalApply.IDeleteAccountWithdrawalApplyBMO;
+import com.java110.acct.bmo.accountWithdrawalApply.IGetAccountWithdrawalApplyBMO;
+import com.java110.acct.bmo.accountWithdrawalApply.ISaveAccountWithdrawalApplyBMO;
+import com.java110.acct.bmo.accountWithdrawalApply.IUpdateAccountWithdrawalApplyBMO;
+import com.java110.dto.accountWithdrawalApply.AccountWithdrawalApplyDto;
+import com.java110.po.accountWithdrawalApply.AccountWithdrawalApplyPo;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping(value = "/accountWithdrawalApply")
+public class AccountWithdrawalApplyApi {
+
+    @Autowired
+    private ISaveAccountWithdrawalApplyBMO saveAccountWithdrawalApplyBMOImpl;
+    @Autowired
+    private IUpdateAccountWithdrawalApplyBMO updateAccountWithdrawalApplyBMOImpl;
+    @Autowired
+    private IDeleteAccountWithdrawalApplyBMO deleteAccountWithdrawalApplyBMOImpl;
+
+    @Autowired
+    private IGetAccountWithdrawalApplyBMO getAccountWithdrawalApplyBMOImpl;
+
+    /**
+     * 微信保存消息模板
+     * @serviceCode /accountWithdrawalApply/saveAccountWithdrawalApply
+     * @path /app/accountWithdrawalApply/saveAccountWithdrawalApply
+     * @param reqJson
+     * @return
+     */
+    @RequestMapping(value = "/saveAccountWithdrawalApply", method = RequestMethod.POST)
+    public ResponseEntity<String> saveAccountWithdrawalApply(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "acctId", "请求报文中未包含acctId");
+        Assert.hasKeyAndValue(reqJson, "amount", "请求报文中未包含amount");
+        Assert.hasKeyAndValue(reqJson, "applyUserId", "请求报文中未包含applyUserId");
+        Assert.hasKeyAndValue(reqJson, "applyUserName", "请求报文中未包含applyUserName");
+        Assert.hasKeyAndValue(reqJson, "applyUserTel", "请求报文中未包含applyUserTel");
+        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
+
+
+        AccountWithdrawalApplyPo accountWithdrawalApplyPo = BeanConvertUtil.covertBean(reqJson, AccountWithdrawalApplyPo.class);
+        return saveAccountWithdrawalApplyBMOImpl.save(accountWithdrawalApplyPo);
+    }
+
+    /**
+     * 微信修改消息模板
+     * @serviceCode /accountWithdrawalApply/updateAccountWithdrawalApply
+     * @path /app/accountWithdrawalApply/updateAccountWithdrawalApply
+     * @param reqJson
+     * @return
+     */
+    @RequestMapping(value = "/updateAccountWithdrawalApply", method = RequestMethod.POST)
+    public ResponseEntity<String> updateAccountWithdrawalApply(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "acctId", "请求报文中未包含acctId");
+        Assert.hasKeyAndValue(reqJson, "amount", "请求报文中未包含amount");
+        Assert.hasKeyAndValue(reqJson, "applyUserId", "请求报文中未包含applyUserId");
+        Assert.hasKeyAndValue(reqJson, "applyUserName", "请求报文中未包含applyUserName");
+        Assert.hasKeyAndValue(reqJson, "applyUserTel", "请求报文中未包含applyUserTel");
+        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
+        Assert.hasKeyAndValue(reqJson, "applyId", "applyId不能为空");
+
+
+        AccountWithdrawalApplyPo accountWithdrawalApplyPo = BeanConvertUtil.covertBean(reqJson, AccountWithdrawalApplyPo.class);
+        return updateAccountWithdrawalApplyBMOImpl.update(accountWithdrawalApplyPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     * @serviceCode /accountWithdrawalApply/deleteAccountWithdrawalApply
+     * @path /app/accountWithdrawalApply/deleteAccountWithdrawalApply
+     * @param reqJson
+     * @return
+     */
+    @RequestMapping(value = "/deleteAccountWithdrawalApply", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteAccountWithdrawalApply(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
+        Assert.hasKeyAndValue(reqJson, "applyId", "applyId不能为空");
+
+
+        AccountWithdrawalApplyPo accountWithdrawalApplyPo = BeanConvertUtil.covertBean(reqJson, AccountWithdrawalApplyPo.class);
+        return deleteAccountWithdrawalApplyBMOImpl.delete(accountWithdrawalApplyPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     * @serviceCode /accountWithdrawalApply/queryAccountWithdrawalApply
+     * @path /app/accountWithdrawalApply/queryAccountWithdrawalApply
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/queryAccountWithdrawalApply", method = RequestMethod.GET)
+    public ResponseEntity<String> queryAccountWithdrawalApply(@RequestParam(value = "page") int page,
+                                                      @RequestParam(value = "row") int row) {
+        AccountWithdrawalApplyDto accountWithdrawalApplyDto = new AccountWithdrawalApplyDto();
+        accountWithdrawalApplyDto.setPage(page);
+        accountWithdrawalApplyDto.setRow(row);
+        return getAccountWithdrawalApplyBMOImpl.get(accountWithdrawalApplyDto);
+    }
+}

service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/IDeleteAccountWithdrawalApplyBMO.java

@@ -0,0 +1,17 @@
+package com.java110.acct.bmo.accountWithdrawalApply;
+import com.java110.po.accountWithdrawalApply.AccountWithdrawalApplyPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IDeleteAccountWithdrawalApplyBMO {
+
+
+    /**
+     * 修改账户提现
+     * add by wuxw
+     * @param accountWithdrawalApplyPo
+     * @return
+     */
+    ResponseEntity<String> delete(AccountWithdrawalApplyPo accountWithdrawalApplyPo);
+
+
+}

service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/IGetAccountWithdrawalApplyBMO.java

@@ -0,0 +1,16 @@
+package com.java110.acct.bmo.accountWithdrawalApply;
+import com.java110.dto.accountWithdrawalApply.AccountWithdrawalApplyDto;
+import org.springframework.http.ResponseEntity;
+public interface IGetAccountWithdrawalApplyBMO {
+
+
+    /**
+     * 查询账户提现
+     * add by wuxw
+     * @param  accountWithdrawalApplyDto
+     * @return
+     */
+    ResponseEntity<String> get(AccountWithdrawalApplyDto accountWithdrawalApplyDto);
+
+
+}

service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/ISaveAccountWithdrawalApplyBMO.java

@@ -0,0 +1,17 @@
+package com.java110.acct.bmo.accountWithdrawalApply;
+
+import com.java110.po.accountWithdrawalApply.AccountWithdrawalApplyPo;
+import org.springframework.http.ResponseEntity;
+public interface ISaveAccountWithdrawalApplyBMO {
+
+
+    /**
+     * 添加账户提现
+     * add by wuxw
+     * @param accountWithdrawalApplyPo
+     * @return
+     */
+    ResponseEntity<String> save(AccountWithdrawalApplyPo accountWithdrawalApplyPo);
+
+
+}

service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/IUpdateAccountWithdrawalApplyBMO.java

@@ -0,0 +1,17 @@
+package com.java110.acct.bmo.accountWithdrawalApply;
+import com.java110.po.accountWithdrawalApply.AccountWithdrawalApplyPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IUpdateAccountWithdrawalApplyBMO {
+
+
+    /**
+     * 修改账户提现
+     * add by wuxw
+     * @param accountWithdrawalApplyPo
+     * @return
+     */
+    ResponseEntity<String> update(AccountWithdrawalApplyPo accountWithdrawalApplyPo);
+
+
+}

service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/impl/DeleteAccountWithdrawalApplyBMOImpl.java

@@ -0,0 +1,36 @@
+package com.java110.acct.bmo.accountWithdrawalApply.impl;
+
+import com.java110.acct.bmo.accountWithdrawalApply.IDeleteAccountWithdrawalApplyBMO;
+import com.java110.core.annotation.Java110Transactional;
+
+import com.java110.intf.acct.IAccountWithdrawalApplyInnerServiceSMO;
+import com.java110.po.accountWithdrawalApply.AccountWithdrawalApplyPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+
+@Service("deleteAccountWithdrawalApplyBMOImpl")
+public class DeleteAccountWithdrawalApplyBMOImpl implements IDeleteAccountWithdrawalApplyBMO {
+
+    @Autowired
+    private IAccountWithdrawalApplyInnerServiceSMO accountWithdrawalApplyInnerServiceSMOImpl;
+
+    /**
+     * @param accountWithdrawalApplyPo 数据
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> delete(AccountWithdrawalApplyPo accountWithdrawalApplyPo) {
+
+        int flag = accountWithdrawalApplyInnerServiceSMOImpl.deleteAccountWithdrawalApply(accountWithdrawalApplyPo);
+
+        if (flag > 0) {
+        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/impl/GetAccountWithdrawalApplyBMOImpl.java

@@ -0,0 +1,46 @@
+package com.java110.acct.bmo.accountWithdrawalApply.impl;
+
+import com.java110.acct.bmo.accountWithdrawalApply.IGetAccountWithdrawalApplyBMO;
+import com.java110.intf.acct.IAccountWithdrawalApplyInnerServiceSMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import com.java110.dto.accountWithdrawalApply.AccountWithdrawalApplyDto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("getAccountWithdrawalApplyBMOImpl")
+public class GetAccountWithdrawalApplyBMOImpl implements IGetAccountWithdrawalApplyBMO {
+
+    @Autowired
+    private IAccountWithdrawalApplyInnerServiceSMO accountWithdrawalApplyInnerServiceSMOImpl;
+
+    /**
+     *
+     *
+     * @param  accountWithdrawalApplyDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(AccountWithdrawalApplyDto accountWithdrawalApplyDto) {
+
+
+        int count = accountWithdrawalApplyInnerServiceSMOImpl.queryAccountWithdrawalApplysCount(accountWithdrawalApplyDto);
+
+        List<AccountWithdrawalApplyDto> accountWithdrawalApplyDtos = null;
+        if (count > 0) {
+            accountWithdrawalApplyDtos = accountWithdrawalApplyInnerServiceSMOImpl.queryAccountWithdrawalApplys(accountWithdrawalApplyDto);
+        } else {
+            accountWithdrawalApplyDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) accountWithdrawalApplyDto.getRow()), count, accountWithdrawalApplyDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}

service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/impl/SaveAccountWithdrawalApplyBMOImpl.java

@@ -0,0 +1,40 @@
+package com.java110.acct.bmo.accountWithdrawalApply.impl;
+
+import com.java110.acct.bmo.accountWithdrawalApply.ISaveAccountWithdrawalApplyBMO;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+
+import com.java110.intf.acct.IAccountWithdrawalApplyInnerServiceSMO;
+import com.java110.po.accountWithdrawalApply.AccountWithdrawalApplyPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+@Service("saveAccountWithdrawalApplyBMOImpl")
+public class SaveAccountWithdrawalApplyBMOImpl implements ISaveAccountWithdrawalApplyBMO {
+
+    @Autowired
+    private IAccountWithdrawalApplyInnerServiceSMO accountWithdrawalApplyInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param accountWithdrawalApplyPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> save(AccountWithdrawalApplyPo accountWithdrawalApplyPo) {
+
+        accountWithdrawalApplyPo.setApplyId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyId));
+        int flag = accountWithdrawalApplyInnerServiceSMOImpl.saveAccountWithdrawalApply(accountWithdrawalApplyPo);
+
+        if (flag > 0) {
+        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/impl/UpdateAccountWithdrawalApplyBMOImpl.java

@@ -0,0 +1,38 @@
+package com.java110.acct.bmo.accountWithdrawalApply.impl;
+
+import com.java110.acct.bmo.accountWithdrawalApply.IUpdateAccountWithdrawalApplyBMO;
+import com.java110.core.annotation.Java110Transactional;
+
+import com.java110.intf.acct.IAccountWithdrawalApplyInnerServiceSMO;
+import com.java110.po.accountWithdrawalApply.AccountWithdrawalApplyPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+
+@Service("updateAccountWithdrawalApplyBMOImpl")
+public class UpdateAccountWithdrawalApplyBMOImpl implements IUpdateAccountWithdrawalApplyBMO {
+
+    @Autowired
+    private IAccountWithdrawalApplyInnerServiceSMO accountWithdrawalApplyInnerServiceSMOImpl;
+
+    /**
+     *
+     *
+     * @param accountWithdrawalApplyPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> update(AccountWithdrawalApplyPo accountWithdrawalApplyPo) {
+
+        int flag = accountWithdrawalApplyInnerServiceSMOImpl.updateAccountWithdrawalApply(accountWithdrawalApplyPo);
+
+        if (flag > 0) {
+        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-acct/src/main/java/com/java110/acct/dao/IAccountWithdrawalApplyServiceDao.java

@@ -0,0 +1,61 @@
+package com.java110.acct.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 账户提现组件内部之间使用，没有给外围系统提供服务能力
+ * 账户提现服务接口类，要求全部以字符串传输，方便微服务化
+ * 新建客户，修改客户，删除客户，查询客户等功能
+ *
+ * Created by wuxw on 2016/12/27.
+ */
+public interface IAccountWithdrawalApplyServiceDao {
+
+
+    /**
+     * 保存 账户提现信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveAccountWithdrawalApplyInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询账户提现信息（instance过程）
+     * 根据bId 查询账户提现信息
+     * @param info bId 信息
+     * @return 账户提现信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getAccountWithdrawalApplyInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改账户提现信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateAccountWithdrawalApplyInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询账户提现总数
+     *
+     * @param info 账户提现信息
+     * @return 账户提现数量
+     */
+    int queryAccountWithdrawalApplysCount(Map info);
+
+}

service-acct/src/main/java/com/java110/acct/dao/impl/AccountWithdrawalApplyServiceDaoImpl.java

@@ -0,0 +1,98 @@
+package com.java110.acct.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.acct.dao.IAccountWithdrawalApplyServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 账户提现服务 与数据库交互
+ * Created by wuxw on 2017/4/5.
+ */
+@Service("accountWithdrawalApplyServiceDaoImpl")
+//@Transactional
+public class AccountWithdrawalApplyServiceDaoImpl extends BaseServiceDao implements IAccountWithdrawalApplyServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(AccountWithdrawalApplyServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存账户提现信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveAccountWithdrawalApplyInfo(Map info) throws DAOException {
+        logger.debug("保存账户提现信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("accountWithdrawalApplyServiceDaoImpl.saveAccountWithdrawalApplyInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存账户提现信息Instance数据失败："+ JSONObject.toJSONString(info));
+        }
+    }
+
+
+    /**
+     * 查询账户提现信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getAccountWithdrawalApplyInfo(Map info) throws DAOException {
+        logger.debug("查询账户提现信息 入参 info : {}",info);
+
+        List<Map> businessAccountWithdrawalApplyInfos = sqlSessionTemplate.selectList("accountWithdrawalApplyServiceDaoImpl.getAccountWithdrawalApplyInfo",info);
+
+        return businessAccountWithdrawalApplyInfos;
+    }
+
+
+    /**
+     * 修改账户提现信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateAccountWithdrawalApplyInfo(Map info) throws DAOException {
+        logger.debug("修改账户提现信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("accountWithdrawalApplyServiceDaoImpl.updateAccountWithdrawalApplyInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改账户提现信息Instance数据失败："+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询账户提现数量
+     * @param info 账户提现信息
+     * @return 账户提现数量
+     */
+    @Override
+    public int queryAccountWithdrawalApplysCount(Map info) {
+        logger.debug("查询账户提现数据 入参 info : {}",info);
+
+        List<Map> businessAccountWithdrawalApplyInfos = sqlSessionTemplate.selectList("accountWithdrawalApplyServiceDaoImpl.queryAccountWithdrawalApplysCount", info);
+        if (businessAccountWithdrawalApplyInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessAccountWithdrawalApplyInfos.get(0).get("count").toString());
+    }
+
+
+}

service-acct/src/main/java/com/java110/acct/smo/impl/AccountWithdrawalApplyInnerServiceSMOImpl.java

@@ -0,0 +1,83 @@
+package com.java110.acct.smo.impl;
+
+
+import com.java110.acct.dao.IAccountWithdrawalApplyServiceDao;
+import com.java110.dto.accountWithdrawalApply.AccountWithdrawalApplyDto;
+import com.java110.intf.acct.IAccountWithdrawalApplyInnerServiceSMO;
+import com.java110.po.accountWithdrawalApply.AccountWithdrawalApplyPo;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName FloorInnerServiceSMOImpl
+ * @Description 账户提现内部服务实现类
+ * @Author wuxw
+ * @Date 2019/4/24 9:20
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@RestController
+public class AccountWithdrawalApplyInnerServiceSMOImpl extends BaseServiceSMO implements IAccountWithdrawalApplyInnerServiceSMO {
+
+    @Autowired
+    private IAccountWithdrawalApplyServiceDao accountWithdrawalApplyServiceDaoImpl;
+
+
+    @Override
+    public int saveAccountWithdrawalApply(@RequestBody AccountWithdrawalApplyPo accountWithdrawalApplyPo) {
+        int saveFlag = 1;
+        accountWithdrawalApplyServiceDaoImpl.saveAccountWithdrawalApplyInfo(BeanConvertUtil.beanCovertMap(accountWithdrawalApplyPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int updateAccountWithdrawalApply(@RequestBody  AccountWithdrawalApplyPo accountWithdrawalApplyPo) {
+        int saveFlag = 1;
+         accountWithdrawalApplyServiceDaoImpl.updateAccountWithdrawalApplyInfo(BeanConvertUtil.beanCovertMap(accountWithdrawalApplyPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int deleteAccountWithdrawalApply(@RequestBody  AccountWithdrawalApplyPo accountWithdrawalApplyPo) {
+        int saveFlag = 1;
+        accountWithdrawalApplyPo.setStatusCd("1");
+        accountWithdrawalApplyServiceDaoImpl.updateAccountWithdrawalApplyInfo(BeanConvertUtil.beanCovertMap(accountWithdrawalApplyPo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<AccountWithdrawalApplyDto> queryAccountWithdrawalApplys(@RequestBody  AccountWithdrawalApplyDto accountWithdrawalApplyDto) {
+
+        //校验是否传了 分页信息
+
+        int page = accountWithdrawalApplyDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            accountWithdrawalApplyDto.setPage((page - 1) * accountWithdrawalApplyDto.getRow());
+        }
+
+        List<AccountWithdrawalApplyDto> accountWithdrawalApplys = BeanConvertUtil.covertBeanList(accountWithdrawalApplyServiceDaoImpl.getAccountWithdrawalApplyInfo(BeanConvertUtil.beanCovertMap(accountWithdrawalApplyDto)), AccountWithdrawalApplyDto.class);
+
+        return accountWithdrawalApplys;
+    }
+
+
+    @Override
+    public int queryAccountWithdrawalApplysCount(@RequestBody AccountWithdrawalApplyDto accountWithdrawalApplyDto) {
+        return accountWithdrawalApplyServiceDaoImpl.queryAccountWithdrawalApplysCount(BeanConvertUtil.beanCovertMap(accountWithdrawalApplyDto));    }
+
+    public IAccountWithdrawalApplyServiceDao getAccountWithdrawalApplyServiceDaoImpl() {
+        return accountWithdrawalApplyServiceDaoImpl;
+    }
+
+    public void setAccountWithdrawalApplyServiceDaoImpl(IAccountWithdrawalApplyServiceDao accountWithdrawalApplyServiceDaoImpl) {
+        this.accountWithdrawalApplyServiceDaoImpl = accountWithdrawalApplyServiceDaoImpl;
+    }
+}