diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java index 07e506404..582e236ce 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java @@ -113,8 +113,8 @@ public class WxCardPayController extends BaseController { } MallUserInfo user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); - final Map map = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); - return new ResultData(map); + final List> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); + return new ResultData(mapList); } @ApiOperation("交易流水导出") diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index fd72cdcc5..7df8704f8 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -1,7 +1,7 @@ spring: # JDBC 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==) password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) type: com.alibaba.druid.pool.DruidDataSource diff --git a/mallinkAdmin/src/main/resources/application-test.yml b/mallinkAdmin/src/main/resources/application-test.yml index 587e40eb5..0b9a23850 100644 --- a/mallinkAdmin/src/main/resources/application-test.yml +++ b/mallinkAdmin/src/main/resources/application-test.yml @@ -1,7 +1,7 @@ spring: # JDBC 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==) password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) type: com.alibaba.druid.pool.DruidDataSource diff --git a/mallinkAdmin/src/main/resources/application.yml b/mallinkAdmin/src/main/resources/application.yml index 2587cdd4c..b42f55151 100644 --- a/mallinkAdmin/src/main/resources/application.yml +++ b/mallinkAdmin/src/main/resources/application.yml @@ -23,8 +23,8 @@ spring: time-to-live: 60000ms #很重要,缓存的有效时间,以便缓存的过期(单位为毫秒) mail: host: smtp.exmail.qq.com - username: wuguoqiang@iformall.com - password: SL4ZBgG3pXWqpAk3 # 授权密码 + username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) + password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 properties: mail: smtp: @@ -43,6 +43,8 @@ mybatis: lazy-loading-enabled: true use-generated-keys: true default-fetch-size: 100 + default-statement-timeout: 10 + #PageHelper pagehelper: diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index 9905ba768..04c569770 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -17,6 +17,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -62,7 +63,7 @@ public class WxCardPayController extends BaseController { WxMerchantBUser user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); wxCardSpend.setMerchantId(user.getMerchantId()); - final Map map = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); - return new ResultData(map); + final List> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); + return new ResultData(mapList); } } diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index 5c4aaf39c..693737f24 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -1,7 +1,7 @@ spring: # JDBC 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==) password: ENC(OZXsE6/Tj+V1Yu2wdjnIGbNOaBVQzi9W) type: com.alibaba.druid.pool.DruidDataSource diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index 28021fe41..88041cb26 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -1,7 +1,7 @@ spring: # JDBC 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==) password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) type: com.alibaba.druid.pool.DruidDataSource diff --git a/mallinkBApi/src/main/resources/application-test.yml b/mallinkBApi/src/main/resources/application-test.yml index e535f61ce..fcb5cb922 100644 --- a/mallinkBApi/src/main/resources/application-test.yml +++ b/mallinkBApi/src/main/resources/application-test.yml @@ -1,7 +1,7 @@ spring: # JDBC 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==) password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) type: com.alibaba.druid.pool.DruidDataSource diff --git a/mallinkBApi/src/main/resources/application.yml b/mallinkBApi/src/main/resources/application.yml index 3e27ac7f8..50d22354f 100644 --- a/mallinkBApi/src/main/resources/application.yml +++ b/mallinkBApi/src/main/resources/application.yml @@ -15,8 +15,8 @@ spring: default-property-inclusion: non_null mail: host: smtp.exmail.qq.com - username: wuguoqiang@iformall.com - password: SL4ZBgG3pXWqpAk3 # 授权密码 + username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) + password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 properties: mail: smtp: @@ -35,6 +35,7 @@ mybatis: lazy-loading-enabled: true use-generated-keys: true default-fetch-size: 100 + default-statement-timeout: 10 #PageHelper pagehelper: diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index 668c99134..e122846c4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; +import java.util.List; import java.util.Map; /** @@ -162,7 +163,7 @@ public class WxCardPayController extends BaseController { WxCUser user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); wxCardSpend.setOwnerId(user.getId()); - final Map map = wxCardSpendService.sumCardSpendForOwner(wxCardSpend); - return new ResultData(map); + final List> mapList = wxCardSpendService.sumCardSpendForOwner(wxCardSpend); + return new ResultData(mapList); } } diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 9b9c66e3f..0c1eba6d1 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -1,7 +1,7 @@ spring: # JDBC 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==) password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) type: com.alibaba.druid.pool.DruidDataSource diff --git a/mallinkCApi/src/main/resources/application-test.yml b/mallinkCApi/src/main/resources/application-test.yml index a7ffb6efb..7a6f7141f 100644 --- a/mallinkCApi/src/main/resources/application-test.yml +++ b/mallinkCApi/src/main/resources/application-test.yml @@ -1,7 +1,7 @@ spring: # JDBC 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==) password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) type: com.alibaba.druid.pool.DruidDataSource diff --git a/mallinkCApi/src/main/resources/application.yml b/mallinkCApi/src/main/resources/application.yml index eebcee65e..a0d7a4395 100644 --- a/mallinkCApi/src/main/resources/application.yml +++ b/mallinkCApi/src/main/resources/application.yml @@ -14,8 +14,8 @@ spring: default-property-inclusion: non_null mail: host: smtp.exmail.qq.com - username: wuguoqiang@iformall.com - password: SL4ZBgG3pXWqpAk3 # 授权密码 + username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) + password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 properties: mail: smtp: @@ -35,6 +35,7 @@ mybatis: lazy-loading-enabled: true use-generated-keys: true default-fetch-size: 100 + default-statement-timeout: 10 #PageHelper pagehelper: diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index 94435ab1c..e8f530704 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -1,7 +1,7 @@ spring: # JDBC 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==) password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) type: com.alibaba.druid.pool.DruidDataSource diff --git a/mallinkSchedule/src/main/resources/application-test.yml b/mallinkSchedule/src/main/resources/application-test.yml index e93df812c..231dfeac4 100644 --- a/mallinkSchedule/src/main/resources/application-test.yml +++ b/mallinkSchedule/src/main/resources/application-test.yml @@ -1,7 +1,7 @@ spring: # JDBC 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==) password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=) type: com.alibaba.druid.pool.DruidDataSource diff --git a/mallinkSchedule/src/main/resources/application.yml b/mallinkSchedule/src/main/resources/application.yml index d7f73fa8b..32c467676 100644 --- a/mallinkSchedule/src/main/resources/application.yml +++ b/mallinkSchedule/src/main/resources/application.yml @@ -23,8 +23,8 @@ spring: time-to-live: 60000ms #很重要,缓存的有效时间,以便缓存的过期(单位为毫秒) mail: host: smtp.exmail.qq.com - username: wuguoqiang@iformall.com - password: SL4ZBgG3pXWqpAk3 # 授权密码 + username: ENC(R0bER9E9OB9/YQcpNXMyYDwofNVb8/pFl4nrApS8mi0=) + password: ENC(50YqJd0iK/2r2YnmEd5RKaki3ktU73UDapBJrVYfqmc=) # 授权密码 properties: mail: smtp: @@ -44,6 +44,7 @@ mybatis: lazy-loading-enabled: true use-generated-keys: true default-fetch-size: 100 + default-statement-timeout: 10 #PageHelper pagehelper: diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java index d88fd10c7..244941a1e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java @@ -41,6 +41,12 @@ public class WxCardVo extends WxCardInfo { /**购买金额**/ @io.swagger.annotations.ApiModelProperty(value = "购买金额", name = "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*/ diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java index 45a34c076..642a54e35 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPayVo.java @@ -21,6 +21,14 @@ public class WxOrderPayVo extends WxOrder { @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="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() { return merchantName; } @@ -53,6 +61,24 @@ public class WxOrderPayVo extends WxOrder { 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 { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java index c0d666a18..8d8e92759 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java @@ -13,9 +13,9 @@ public interface WxCardSpendMapper extends CommonMapper { List findCardSpendVoList(WxCardSpend wxCardSpend); - Map sumCardSpendVoForMerchant(WxCardSpend wxCardSpend); + List> sumCardSpendVoForMerchant(WxCardSpend wxCardSpend); - Map sumCardSpendVoForOwner(WxCardSpend wxCardSpend); + List> sumCardSpendVoForOwner(WxCardSpend wxCardSpend); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java index f71e0c672..4d259b410 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java @@ -7,6 +7,7 @@ import com.iformall.domain.vo.WxCardSpendVo; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.List; import java.util.Map; public interface WxCardSpendService { @@ -42,7 +43,7 @@ public interface WxCardSpendService { * @param record * @return */ - Map sumCardSpendForMerchant(WxCardSpendVo record); + List> sumCardSpendForMerchant(WxCardSpendVo record); /** * 根据实体SUM @@ -50,7 +51,7 @@ public interface WxCardSpendService { * @param record * @return */ - Map sumCardSpendForOwner(WxCardSpendVo record); + List> sumCardSpendForOwner(WxCardSpendVo record); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index ded1a1a2c..167edc19a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -248,12 +248,12 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } @Override - public Map sumCardSpendForMerchant(WxCardSpendVo record) { + public List> sumCardSpendForMerchant(WxCardSpendVo record) { return wxCardSpendMapper.sumCardSpendVoForMerchant(record); } @Override - public Map sumCardSpendForOwner(WxCardSpendVo record) { + public List> sumCardSpendForOwner(WxCardSpendVo record) { return wxCardSpendMapper.sumCardSpendVoForOwner(record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index bd25c5bba..99e67dfcf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -842,6 +842,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_AREA.getCode())) { areaWay(wxRentContract, result, lease, adjustRatio, extralease, extracount, paycount, index, count, rentPrice); } 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); } //物业合同信息 diff --git a/mallinkService/src/main/resources/contract-word-template/contract_rent_property_by_ratio.docx b/mallinkService/src/main/resources/contract-word-template/contract_rent_property_by_ratio.docx index 1f26e8e62..92e0d36e2 100644 Binary files a/mallinkService/src/main/resources/contract-word-template/contract_rent_property_by_ratio.docx and b/mallinkService/src/main/resources/contract-word-template/contract_rent_property_by_ratio.docx differ diff --git a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml index ef0bcfad2..26e79483d 100644 --- a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml @@ -97,6 +97,8 @@ + + @@ -112,7 +114,7 @@ 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`, - 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, cu.`nick_name` as c_nick_name, ou.`nick_name` as o_nick_name, ou.`phone` as ou_phone diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index e2a6faf26..2da3e4adb 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -273,6 +273,7 @@ + @@ -280,7 +281,8 @@ 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`, - 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