| @@ -113,8 +113,8 @@ public class WxCardPayController extends BaseController { | |||||
| } | } | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| wxCardSpend.setTenantId(user.getTenantId()); | wxCardSpend.setTenantId(user.getTenantId()); | ||||
| final Map map = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); | |||||
| return new ResultData(map); | |||||
| final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); | |||||
| return new ResultData(mapList); | |||||
| } | } | ||||
| @ApiOperation("交易流水导出") | @ApiOperation("交易流水导出") | ||||
| @@ -1,7 +1,7 @@ | |||||
| spring: | spring: | ||||
| # JDBC | # JDBC | ||||
| datasource: | datasource: | ||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?useUnicode=true&characterEncoding=UTF-8 | |||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false | |||||
| username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | ||||
| password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | ||||
| type: com.alibaba.druid.pool.DruidDataSource | type: com.alibaba.druid.pool.DruidDataSource | ||||
| @@ -1,7 +1,7 @@ | |||||
| spring: | spring: | ||||
| # JDBC | # JDBC | ||||
| datasource: | datasource: | ||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?useUnicode=true&characterEncoding=UTF-8 | |||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false | |||||
| username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | ||||
| password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | ||||
| type: com.alibaba.druid.pool.DruidDataSource | type: com.alibaba.druid.pool.DruidDataSource | ||||
| @@ -23,8 +23,8 @@ spring: | |||||
| time-to-live: 60000ms #很重要,缓存的有效时间,以便缓存的过期(单位为毫秒) | time-to-live: 60000ms #很重要,缓存的有效时间,以便缓存的过期(单位为毫秒) | ||||
| mail: | mail: | ||||
| host: smtp.exmail.qq.com | host: smtp.exmail.qq.com | ||||
| username: wuguoqiang@iformall.com | |||||
| password: SL4ZBgG3pXWqpAk3 # 授权密码 | |||||
| username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) | |||||
| password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 | |||||
| properties: | properties: | ||||
| mail: | mail: | ||||
| smtp: | smtp: | ||||
| @@ -43,6 +43,8 @@ mybatis: | |||||
| lazy-loading-enabled: true | lazy-loading-enabled: true | ||||
| use-generated-keys: true | use-generated-keys: true | ||||
| default-fetch-size: 100 | default-fetch-size: 100 | ||||
| default-statement-timeout: 10 | |||||
| #PageHelper | #PageHelper | ||||
| pagehelper: | pagehelper: | ||||
| @@ -17,6 +17,7 @@ import org.slf4j.LoggerFactory; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
| import java.util.List; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| /** | /** | ||||
| @@ -62,7 +63,7 @@ public class WxCardPayController extends BaseController { | |||||
| WxMerchantBUser user = getUser(); | WxMerchantBUser user = getUser(); | ||||
| wxCardSpend.setTenantId(user.getTenantId()); | wxCardSpend.setTenantId(user.getTenantId()); | ||||
| wxCardSpend.setMerchantId(user.getMerchantId()); | wxCardSpend.setMerchantId(user.getMerchantId()); | ||||
| final Map map = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); | |||||
| return new ResultData(map); | |||||
| final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); | |||||
| return new ResultData(mapList); | |||||
| } | } | ||||
| } | } | ||||
| @@ -1,7 +1,7 @@ | |||||
| spring: | spring: | ||||
| # JDBC | # JDBC | ||||
| datasource: | datasource: | ||||
| url: jdbc:mysql://202.165.179.86:3306/mallinkDev?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 | |||||
| url: jdbc:mysql://202.165.179.86:3306/mallinkDev?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false | |||||
| username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) | username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) | ||||
| password: ENC(OZXsE6/Tj+V1Yu2wdjnIGbNOaBVQzi9W) | password: ENC(OZXsE6/Tj+V1Yu2wdjnIGbNOaBVQzi9W) | ||||
| type: com.alibaba.druid.pool.DruidDataSource | type: com.alibaba.druid.pool.DruidDataSource | ||||
| @@ -1,7 +1,7 @@ | |||||
| spring: | spring: | ||||
| # JDBC | # JDBC | ||||
| datasource: | datasource: | ||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 | |||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false | |||||
| username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | ||||
| password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | ||||
| type: com.alibaba.druid.pool.DruidDataSource | type: com.alibaba.druid.pool.DruidDataSource | ||||
| @@ -1,7 +1,7 @@ | |||||
| spring: | spring: | ||||
| # JDBC | # JDBC | ||||
| datasource: | datasource: | ||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 | |||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false | |||||
| username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | ||||
| password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | ||||
| type: com.alibaba.druid.pool.DruidDataSource | type: com.alibaba.druid.pool.DruidDataSource | ||||
| @@ -15,8 +15,8 @@ spring: | |||||
| default-property-inclusion: non_null | default-property-inclusion: non_null | ||||
| mail: | mail: | ||||
| host: smtp.exmail.qq.com | host: smtp.exmail.qq.com | ||||
| username: wuguoqiang@iformall.com | |||||
| password: SL4ZBgG3pXWqpAk3 # 授权密码 | |||||
| username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) | |||||
| password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 | |||||
| properties: | properties: | ||||
| mail: | mail: | ||||
| smtp: | smtp: | ||||
| @@ -35,6 +35,7 @@ mybatis: | |||||
| lazy-loading-enabled: true | lazy-loading-enabled: true | ||||
| use-generated-keys: true | use-generated-keys: true | ||||
| default-fetch-size: 100 | default-fetch-size: 100 | ||||
| default-statement-timeout: 10 | |||||
| #PageHelper | #PageHelper | ||||
| pagehelper: | pagehelper: | ||||
| @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*; | |||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.util.List; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| /** | /** | ||||
| @@ -162,7 +163,7 @@ public class WxCardPayController extends BaseController { | |||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| wxCardSpend.setTenantId(user.getTenantId()); | wxCardSpend.setTenantId(user.getTenantId()); | ||||
| wxCardSpend.setOwnerId(user.getId()); | wxCardSpend.setOwnerId(user.getId()); | ||||
| final Map map = wxCardSpendService.sumCardSpendForOwner(wxCardSpend); | |||||
| return new ResultData(map); | |||||
| final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForOwner(wxCardSpend); | |||||
| return new ResultData(mapList); | |||||
| } | } | ||||
| } | } | ||||
| @@ -1,7 +1,7 @@ | |||||
| spring: | spring: | ||||
| # JDBC | # JDBC | ||||
| datasource: | datasource: | ||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 | |||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false | |||||
| username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | ||||
| password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | ||||
| type: com.alibaba.druid.pool.DruidDataSource | type: com.alibaba.druid.pool.DruidDataSource | ||||
| @@ -1,7 +1,7 @@ | |||||
| spring: | spring: | ||||
| # JDBC | # JDBC | ||||
| datasource: | datasource: | ||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 | |||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false | |||||
| username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | ||||
| password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | ||||
| type: com.alibaba.druid.pool.DruidDataSource | type: com.alibaba.druid.pool.DruidDataSource | ||||
| @@ -14,8 +14,8 @@ spring: | |||||
| default-property-inclusion: non_null | default-property-inclusion: non_null | ||||
| mail: | mail: | ||||
| host: smtp.exmail.qq.com | host: smtp.exmail.qq.com | ||||
| username: wuguoqiang@iformall.com | |||||
| password: SL4ZBgG3pXWqpAk3 # 授权密码 | |||||
| username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) | |||||
| password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 | |||||
| properties: | properties: | ||||
| mail: | mail: | ||||
| smtp: | smtp: | ||||
| @@ -35,6 +35,7 @@ mybatis: | |||||
| lazy-loading-enabled: true | lazy-loading-enabled: true | ||||
| use-generated-keys: true | use-generated-keys: true | ||||
| default-fetch-size: 100 | default-fetch-size: 100 | ||||
| default-statement-timeout: 10 | |||||
| #PageHelper | #PageHelper | ||||
| pagehelper: | pagehelper: | ||||
| @@ -1,7 +1,7 @@ | |||||
| spring: | spring: | ||||
| # JDBC | # JDBC | ||||
| datasource: | datasource: | ||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 | |||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false | |||||
| username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | ||||
| password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | ||||
| type: com.alibaba.druid.pool.DruidDataSource | type: com.alibaba.druid.pool.DruidDataSource | ||||
| @@ -1,7 +1,7 @@ | |||||
| spring: | spring: | ||||
| # JDBC | # JDBC | ||||
| datasource: | datasource: | ||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8 | |||||
| url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false | |||||
| username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | username: ENC(BDv01/sQdBGEhFEXuw+8tw==) | ||||
| password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) | ||||
| type: com.alibaba.druid.pool.DruidDataSource | type: com.alibaba.druid.pool.DruidDataSource | ||||
| @@ -23,8 +23,8 @@ spring: | |||||
| time-to-live: 60000ms #很重要,缓存的有效时间,以便缓存的过期(单位为毫秒) | time-to-live: 60000ms #很重要,缓存的有效时间,以便缓存的过期(单位为毫秒) | ||||
| mail: | mail: | ||||
| host: smtp.exmail.qq.com | host: smtp.exmail.qq.com | ||||
| username: wuguoqiang@iformall.com | |||||
| password: SL4ZBgG3pXWqpAk3 # 授权密码 | |||||
| username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) | |||||
| password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 | |||||
| properties: | properties: | ||||
| mail: | mail: | ||||
| smtp: | smtp: | ||||
| @@ -44,6 +44,7 @@ mybatis: | |||||
| lazy-loading-enabled: true | lazy-loading-enabled: true | ||||
| use-generated-keys: true | use-generated-keys: true | ||||
| default-fetch-size: 100 | default-fetch-size: 100 | ||||
| default-statement-timeout: 10 | |||||
| #PageHelper | #PageHelper | ||||
| pagehelper: | pagehelper: | ||||
| @@ -41,6 +41,12 @@ public class WxCardVo extends WxCardInfo { | |||||
| /**购买金额**/ | /**购买金额**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "购买金额", name = "salePrice") | @io.swagger.annotations.ApiModelProperty(value = "购买金额", name = "salePrice") | ||||
| private Integer salePrice; | private Integer salePrice; | ||||
| /**补贴类型**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "补贴类型", name = "subsidyType") | |||||
| private Integer subsidyType; | |||||
| /**补贴金额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "补贴金额", name = "subsidyNum") | |||||
| private Integer subsidyNum; | |||||
| /**购买人ID*/ | /**购买人ID*/ | ||||
| @@ -21,6 +21,14 @@ public class WxOrderPayVo extends WxOrder { | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone") | @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone") | ||||
| private String cUserPhone; | private String cUserPhone; | ||||
| /**c用户昵称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="c用户昵称",name="nickName") | |||||
| private String nickName; | |||||
| /**c用户名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="c用户名",name="cUserName") | |||||
| private String cUserName; | |||||
| public String getMerchantName() { | public String getMerchantName() { | ||||
| return merchantName; | return merchantName; | ||||
| } | } | ||||
| @@ -53,6 +61,24 @@ public class WxOrderPayVo extends WxOrder { | |||||
| this.cUserPhone = cUserPhone; | this.cUserPhone = cUserPhone; | ||||
| } | } | ||||
| public String getNickName() { | |||||
| return nickName; | |||||
| } | |||||
| public void setNickName(String nickName) { | |||||
| this.nickName = nickName; | |||||
| } | |||||
| @Override | |||||
| public String getcUserName() { | |||||
| return cUserName; | |||||
| } | |||||
| @Override | |||||
| public void setcUserName(String cUserName) { | |||||
| this.cUserName = cUserName; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -13,9 +13,9 @@ public interface WxCardSpendMapper extends CommonMapper<WxCardSpend, Long> { | |||||
| List<WxCardSpendVo> findCardSpendVoList(WxCardSpend wxCardSpend); | List<WxCardSpendVo> findCardSpendVoList(WxCardSpend wxCardSpend); | ||||
| Map sumCardSpendVoForMerchant(WxCardSpend wxCardSpend); | |||||
| List<Map<String,Object>> sumCardSpendVoForMerchant(WxCardSpend wxCardSpend); | |||||
| Map sumCardSpendVoForOwner(WxCardSpend wxCardSpend); | |||||
| List<Map<String,Object>> sumCardSpendVoForOwner(WxCardSpend wxCardSpend); | |||||
| @@ -7,6 +7,7 @@ import com.iformall.domain.vo.WxCardSpendVo; | |||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import javax.servlet.http.HttpServletResponse; | import javax.servlet.http.HttpServletResponse; | ||||
| import java.util.List; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| public interface WxCardSpendService { | public interface WxCardSpendService { | ||||
| @@ -42,7 +43,7 @@ public interface WxCardSpendService { | |||||
| * @param record | * @param record | ||||
| * @return | * @return | ||||
| */ | */ | ||||
| Map<String, Object> sumCardSpendForMerchant(WxCardSpendVo record); | |||||
| List<Map<String, Object>> sumCardSpendForMerchant(WxCardSpendVo record); | |||||
| /** | /** | ||||
| * 根据实体SUM | * 根据实体SUM | ||||
| @@ -50,7 +51,7 @@ public interface WxCardSpendService { | |||||
| * @param record | * @param record | ||||
| * @return | * @return | ||||
| */ | */ | ||||
| Map<String, Object> sumCardSpendForOwner(WxCardSpendVo record); | |||||
| List<Map<String, Object>> sumCardSpendForOwner(WxCardSpendVo record); | |||||
| /** | /** | ||||
| * 根据Id获得实体 | * 根据Id获得实体 | ||||
| @@ -248,12 +248,12 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public Map<String, Object> sumCardSpendForMerchant(WxCardSpendVo record) { | |||||
| public List<Map<String, Object>> sumCardSpendForMerchant(WxCardSpendVo record) { | |||||
| return wxCardSpendMapper.sumCardSpendVoForMerchant(record); | return wxCardSpendMapper.sumCardSpendVoForMerchant(record); | ||||
| } | } | ||||
| @Override | @Override | ||||
| public Map<String, Object> sumCardSpendForOwner(WxCardSpendVo record) { | |||||
| public List<Map<String, Object>> sumCardSpendForOwner(WxCardSpendVo record) { | |||||
| return wxCardSpendMapper.sumCardSpendVoForOwner(record); | return wxCardSpendMapper.sumCardSpendVoForOwner(record); | ||||
| } | } | ||||
| @@ -842,6 +842,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_AREA.getCode())) { | if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_AREA.getCode())) { | ||||
| areaWay(wxRentContract, result, lease, adjustRatio, extralease, extracount, paycount, index, count, rentPrice); | areaWay(wxRentContract, result, lease, adjustRatio, extralease, extracount, paycount, index, count, rentPrice); | ||||
| } else { | } else { | ||||
| //保底 | |||||
| double revenue = new BigDecimal(wxRentContract.getRevenue()) | |||||
| .divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); | |||||
| result.put("revenue", revenue); | |||||
| result.put("revenueUpper", digitUppercase(revenue)); | |||||
| ratioWay(wxRentContract, result, lease, adjustRatio, extralease, extracount, paycount, index, count, rentPrice); | ratioWay(wxRentContract, result, lease, adjustRatio, extralease, extracount, paycount, index, count, rentPrice); | ||||
| } | } | ||||
| //物业合同信息 | //物业合同信息 | ||||
| @@ -97,6 +97,8 @@ | |||||
| <result column="remark" jdbcType="VARCHAR" property="remark" /> | <result column="remark" jdbcType="VARCHAR" property="remark" /> | ||||
| <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | ||||
| <result column="price" jdbcType="INTEGER" property="price"/> | <result column="price" jdbcType="INTEGER" property="price"/> | ||||
| <result column="subsidy_type" jdbcType="INTEGER" property="subsidyType"/> | |||||
| <result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/> | |||||
| <result column="c_user_id" jdbcType="BIGINT" property="cuserId" /> | <result column="c_user_id" jdbcType="BIGINT" property="cuserId" /> | ||||
| <result column="owner_id" jdbcType="BIGINT" property="ownerId" /> | <result column="owner_id" jdbcType="BIGINT" property="ownerId" /> | ||||
| @@ -112,7 +114,7 @@ | |||||
| <sql id="allVoColumns"> | <sql id="allVoColumns"> | ||||
| ci.`id`,ci.`tenant_id`,ci.`coupon_id`,ci.`transaction_id`,ci.`amount`,ci.`sale_amount`,ci.`remaining_amount`,ci.`service_fee_amount`,ci.`share_fee_amount`,ci.`remaining_share_fee_amount`, | ci.`id`,ci.`tenant_id`,ci.`coupon_id`,ci.`transaction_id`,ci.`amount`,ci.`sale_amount`,ci.`remaining_amount`,ci.`service_fee_amount`,ci.`share_fee_amount`,ci.`remaining_share_fee_amount`, | ||||
| ci.`create_date`,ci.`update_date`, | ci.`create_date`,ci.`update_date`, | ||||
| c.`cover_img`, c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, | |||||
| c.`cover_img`, c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, c.`subsidy_type`, c.`subsidy_num`, | |||||
| co.`c_user_id`, co.`owner_id`, co.`expired_time`, co.`coupon_order_status` as status, | co.`c_user_id`, co.`owner_id`, co.`expired_time`, co.`coupon_order_status` as status, | ||||
| cu.`nick_name` as c_nick_name, ou.`nick_name` as o_nick_name, ou.`phone` as ou_phone | cu.`nick_name` as c_nick_name, ou.`nick_name` as o_nick_name, ou.`phone` as ou_phone | ||||
| </sql> | </sql> | ||||
| @@ -273,6 +273,7 @@ | |||||
| <result column="name" jdbcType="VARCHAR" property="bUserName" /> | <result column="name" jdbcType="VARCHAR" property="bUserName" /> | ||||
| <result column="bphone" jdbcType="VARCHAR" property="bUserPhone" /> | <result column="bphone" jdbcType="VARCHAR" property="bUserPhone" /> | ||||
| <result column="phone" jdbcType="VARCHAR" property="cUserPhone" /> | <result column="phone" jdbcType="VARCHAR" property="cUserPhone" /> | ||||
| <result column="nick_name" jdbcType="VARCHAR" property="nickName" /> | |||||
| <result column="c_user_name" jdbcType="VARCHAR" property="cUserName" /> | <result column="c_user_name" jdbcType="VARCHAR" property="cUserName" /> | ||||
| </resultMap> | </resultMap> | ||||
| @@ -280,7 +281,8 @@ | |||||
| <sql id="allPayOrderColumns"> | <sql id="allPayOrderColumns"> | ||||
| o.`id`,o.`order_number`,o.`tenant_id`,o.`c_user_id`,o.`product_id`,o.`type`, | o.`id`,o.`order_number`,o.`tenant_id`,o.`c_user_id`,o.`product_id`,o.`type`, | ||||
| o.`payment_type`,o.`payment`,o.`payment_time`,o.`order_status`,o.`create_date`,o.`update_date`,o.`detail`, | o.`payment_type`,o.`payment`,o.`payment_time`,o.`order_status`,o.`create_date`,o.`update_date`,o.`detail`, | ||||
| m.name as merchant_name, bu.name, bu.phone as bphone, cu.phone,cu.c_user_name | |||||
| m.name as merchant_name, bu.name, bu.phone as bphone, | |||||
| cu.phone, cu.nick_name, cubi.name c_user_name | |||||
| </sql> | </sql> | ||||
| <select id="findListOfMicroPayOrderByDate" parameterType="map" resultMap="PayVoResultMap"> | <select id="findListOfMicroPayOrderByDate" parameterType="map" resultMap="PayVoResultMap"> | ||||
| @@ -289,11 +291,8 @@ | |||||
| from wx_order o | from wx_order o | ||||
| inner join wx_merchant_b_user bu on bu.id = o.product_id | inner join wx_merchant_b_user bu on bu.id = o.product_id | ||||
| inner join wx_merchant m on m.id = bu.merchant_id | inner join wx_merchant m on m.id = bu.merchant_id | ||||
| left join ( | |||||
| select cu.id,cu.phone,(select cubi.`name` from wx_c_user_basic_info cubi | |||||
| where cubi.phone=cu.phone and cubi.`name` is not null limit 1) c_user_name | |||||
| from wx_c_user cu | |||||
| ) cu on cu.id = o.c_user_id | |||||
| LEFT JOIN wx_c_user cu on cu.id = o.c_user_id | |||||
| LEFT JOIN wx_c_user_basic_info cubi on cubi.id = o.c_user_id | |||||
| where o.order_status = '1' and o.`type` = 1 | where o.order_status = '1' and o.`type` = 1 | ||||
| <if test=" null != tenantId "> | <if test=" null != tenantId "> | ||||
| and o.`tenant_id` = #{tenantId} | and o.`tenant_id` = #{tenantId} | ||||
| @@ -136,7 +136,7 @@ | |||||
| <dependency> | <dependency> | ||||
| <groupId>com.alibaba</groupId> | <groupId>com.alibaba</groupId> | ||||
| <artifactId>druid</artifactId> | <artifactId>druid</artifactId> | ||||
| <version>1.1.11</version> | |||||
| <version>1.1.12</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>org.mybatis.generator</groupId> | <groupId>org.mybatis.generator</groupId> | ||||