From 63117d5ce8ef92481d4d672e68a1f1988f3d563b Mon Sep 17 00:00:00 2001 From: houjianhui Date: Tue, 15 Aug 2017 15:30:48 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E9=94=80=E5=94=AE=E7=AB=AF=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ils/sales/api/dto/OrderAttachDTO.java | 61 ++ .../com/unlcn/ils/sales/api/dto/OrderDTO.java | 22 + .../ils/sales/api/dto/OrderDetailDTO.java | 14 +- .../ils/sales/api/rest/OrderAttachRest.java | 47 ++ .../unlcn/ils/sales/api/rest/OrderRest.java | 51 +- .../sales/backend/bo/OrderAttachViewBO.java | 53 ++ .../ils/sales/backend/bo/OrderViewBO.java | 31 + .../backend/enums/AttachAuditStatusEnum.java | 37 + .../backend/service/OrderAttachService.java | 26 + .../service/OrderAttachServiceImpl.java | 70 ++ .../sales/backend/service/OrderService.java | 10 + .../backend/service/OrderServiceImpl.java | 45 +- .../base/mapper/SaleOrderAttachMapper.java | 96 +++ .../sales/base/mapper/SaleOrderMapper.java | 22 +- .../sales/base/model/OrderAttachViewDAO.java | 43 + .../ils/sales/base/model/OrderViewDAO.java | 31 + .../unlcn/ils/sales/base/model/SaleOrder.java | 145 ++-- .../ils/sales/base/model/SaleOrderAttach.java | 228 ++++++ .../base/model/SaleOrderAttachExample.java | 734 ++++++++++++++++++ .../sales/base/model/SaleOrderExample.java | 106 ++- .../mappers/SaleOrderAttachMapper.xml | 304 ++++++++ .../resources/mappers/SaleOrderMapper.xml | 60 +- .../resources/mappers/SaleOrderViewMapper.xml | 23 + .../resources/mybatis/generatorConfig.xml | 6 +- 24 files changed, 2138 insertions(+), 127 deletions(-) create mode 100644 ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderAttachDTO.java create mode 100644 ils-sales-api/src/main/java/com/unlcn/ils/sales/api/rest/OrderAttachRest.java create mode 100644 ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderAttachViewBO.java create mode 100644 ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/enums/AttachAuditStatusEnum.java create mode 100644 ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAttachService.java create mode 100644 ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAttachServiceImpl.java create mode 100644 ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderAttachMapper.java create mode 100644 ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderAttachViewDAO.java create mode 100644 ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAttach.java create mode 100644 ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAttachExample.java create mode 100644 ils-sales-base/src/main/resources/mappers/SaleOrderAttachMapper.xml diff --git a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderAttachDTO.java b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderAttachDTO.java new file mode 100644 index 0000000..c9303d0 --- /dev/null +++ b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderAttachDTO.java @@ -0,0 +1,61 @@ +package com.unlcn.ils.sales.api.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * Created by houjianhui on 2017/8/15. + */ +@ApiModel(value = "OrderAttachDTO", description = "销售订单附件") +public class OrderAttachDTO { + @ApiModelProperty(value = "主键ID") + private Integer id; + @ApiModelProperty(value = "图片KEY") + private String picKey; + @ApiModelProperty(value = "销售订单ID") + private Integer saleOrderId; + @ApiModelProperty(value = "附件地址") + private String url; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getPicKey() { + return picKey; + } + + public void setPicKey(String picKey) { + this.picKey = picKey; + } + + public Integer getSaleOrderId() { + return saleOrderId; + } + + public void setSaleOrderId(Integer saleOrderId) { + this.saleOrderId = saleOrderId; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + @Override + public String toString() { + return "OrderAttachDTO{" + + "id=" + id + + ", picKey='" + picKey + '\'' + + ", saleOrderId=" + saleOrderId + + ", url='" + url + '\'' + + '}'; + } +} diff --git a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderDTO.java b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderDTO.java index efc07b8..3801941 100644 --- a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderDTO.java +++ b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderDTO.java @@ -20,6 +20,8 @@ public class OrderDTO { private Date pickDate; @ApiModelProperty(value = "订单物流状态") private Integer orderStatus; + @ApiModelProperty(value = "订单附件审核状态") + private Integer attachAuditStatus; @ApiModelProperty(value = "订单审核状态") private Integer auditStatus; @ApiModelProperty(value = "起运地名称") @@ -38,6 +40,8 @@ public class OrderDTO { private String brandSeries; @ApiModelProperty(value = "订单物流显示状态") private String orderStatusText; + @ApiModelProperty(value = "订单附件审核显示状态") + private String attachAuditStatusText; public Integer getId() { return id; @@ -151,6 +155,22 @@ public class OrderDTO { this.orderStatusText = orderStatusText; } + public Integer getAttachAuditStatus() { + return attachAuditStatus; + } + + public void setAttachAuditStatus(Integer attachAuditStatus) { + this.attachAuditStatus = attachAuditStatus; + } + + public String getAttachAuditStatusText() { + return attachAuditStatusText; + } + + public void setAttachAuditStatusText(String attachAuditStatusText) { + this.attachAuditStatusText = attachAuditStatusText; + } + @Override public String toString() { return "OrderDTO{" + @@ -159,6 +179,7 @@ public class OrderDTO { ", userId=" + userId + ", pickDate=" + pickDate + ", orderStatus=" + orderStatus + + ", attachAuditStatus=" + attachAuditStatus + ", auditStatus=" + auditStatus + ", departRegionName='" + departRegionName + '\'' + ", departContact='" + departContact + '\'' + @@ -168,6 +189,7 @@ public class OrderDTO { ", destPhone='" + destPhone + '\'' + ", brandSeries='" + brandSeries + '\'' + ", orderStatusText='" + orderStatusText + '\'' + + ", attachAuditStatusText='" + attachAuditStatusText + '\'' + '}'; } } diff --git a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderDetailDTO.java b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderDetailDTO.java index a37d4b2..c3c4156 100644 --- a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderDetailDTO.java +++ b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderDetailDTO.java @@ -72,6 +72,9 @@ public class OrderDetailDTO { @ApiModelProperty(value = "商品车信息") private List orderSkus; + @ApiModelProperty(value = "销售订单附件信息") + private List attachs; + public Integer getId() { return id; } @@ -280,6 +283,14 @@ public class OrderDetailDTO { this.pctPrice = pctPrice; } + public List getAttachs() { + return attachs; + } + + public void setAttachs(List attachs) { + this.attachs = attachs; + } + @Override public String toString() { return "OrderDetailDTO{" + @@ -298,7 +309,7 @@ public class OrderDetailDTO { ", auditStatus=" + auditStatus + ", comment='" + comment + '\'' + ", auditComment='" + auditComment + '\'' + - ", pctPrice=" + pctPrice + + ", pctPrice='" + pctPrice + '\'' + ", departRegionCode='" + departRegionCode + '\'' + ", departRegionName='" + departRegionName + '\'' + ", departContact='" + departContact + '\'' + @@ -309,6 +320,7 @@ public class OrderDetailDTO { ", destPhone='" + destPhone + '\'' + ", distance=" + distance + ", orderSkus=" + orderSkus + + ", attachs=" + attachs + '}'; } } diff --git a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/rest/OrderAttachRest.java b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/rest/OrderAttachRest.java new file mode 100644 index 0000000..c7be9ff --- /dev/null +++ b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/rest/OrderAttachRest.java @@ -0,0 +1,47 @@ +package com.unlcn.ils.sales.api.rest; + +import cn.huiyunche.commons.domain.ResultDTO; +import cn.huiyunche.commons.exception.BusinessException; +import com.unlcn.ils.sales.backend.service.OrderAttachService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * Created by houjianhui on 2017/8/14. + */ +@RequestMapping(value = "/api/orderAttach", produces = MediaType.APPLICATION_JSON_VALUE) +@Api(value = "/orderAttach", description = "销售订单附件") +public class OrderAttachRest { + + private static final Logger LOGGER = LoggerFactory.getLogger(OrderAttachRest.class); + + @Autowired + private OrderAttachService orderAttachService; + + /** + * 保存销售订单附件 + * + * @return + * @throws Exception + */ + @RequestMapping(value = "/save", method = RequestMethod.POST) + @ApiOperation(value = "保存销售订单附件", notes = "保存销售订单附件", produces = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + public ResultDTO save(String attachs, Integer saleOrderId) { + ResultDTO result = new ResultDTO<>(true, null, "保存附件成功"); + try { + result.setData(orderAttachService.save(attachs, saleOrderId)); + } catch (Exception e) { + LOGGER.error("OrderAttachRest save error: {}", e); + throw new BusinessException(e.getMessage()); + } + return result; + } +} diff --git a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/rest/OrderRest.java b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/rest/OrderRest.java index ef72f57..cdff2dd 100644 --- a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/rest/OrderRest.java +++ b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/rest/OrderRest.java @@ -4,15 +4,9 @@ import cn.huiyunche.commons.domain.PageVo; import cn.huiyunche.commons.domain.ResultDTO; import cn.huiyunche.commons.exception.BusinessException; import com.google.common.collect.Lists; -import com.unlcn.ils.sales.api.dto.OrderDTO; -import com.unlcn.ils.sales.api.dto.OrderDetailDTO; -import com.unlcn.ils.sales.api.dto.OrderSaveDTO; -import com.unlcn.ils.sales.api.dto.OrderSkuDTO; +import com.unlcn.ils.sales.api.dto.*; import com.unlcn.ils.sales.api.query.OrderQuery; -import com.unlcn.ils.sales.backend.bo.OrderBO; -import com.unlcn.ils.sales.backend.bo.OrderQueryBO; -import com.unlcn.ils.sales.backend.bo.OrderSkuBO; -import com.unlcn.ils.sales.backend.bo.OrderViewBO; +import com.unlcn.ils.sales.backend.bo.*; import com.unlcn.ils.sales.backend.enums.OrderAuditStatusEnum; import com.unlcn.ils.sales.backend.enums.OrderStatusEnum; import com.unlcn.ils.sales.backend.service.OrderService; @@ -128,6 +122,17 @@ public class OrderRest { skuDTOS.add(skuDTO); }); } + + List attachs = viewBO.getAttachs(); + List attachDTOS = Lists.newArrayList(); + if (CollectionUtils.isNotEmpty(attachs)) { + attachs.stream().forEach(val -> { + OrderAttachDTO attachDTO = new OrderAttachDTO(); + BeanUtils.copyProperties(val, attachDTO); + attachDTOS.add(attachDTO); + }); + } + detailDTO.setAttachs(attachDTOS); detailDTO.setOrderSkus(skuDTOS); } result.setData(detailDTO); @@ -245,4 +250,34 @@ public class OrderRest { } + /** + * 销售订单附件审核 + * + * @param orderCode 销售订单编码 + * @param attachAuditStatus 销售订单附件审核状态 + * @return + */ + @RequestMapping(value = "/updateAttachAuditStatus", method = RequestMethod.POST) + @ApiOperation(value = "销售订单附件审核", notes = "销售订单附件审核", produces = MediaType.APPLICATION_JSON_VALUE) + @ApiResponses(value = {@ApiResponse(code = 404, message = "updateAttachAuditStatusByOrderCode not found")}) + @ResponseBody + public ResultDTO updateAttachAuditStatusBySaleOrderCode(@ApiParam(value = "销售订单编码", required = true) String orderCode, + @ApiParam(value = "销售订单附件审核状态", required = true) Integer attachAuditStatus ) { + ResultDTO result = new ResultDTO<>(true, null, "销售订单审核状态更新成功"); + if (StringUtils.isBlank(orderCode)) { + LOGGER.info("OrderRest.updateAttachAuditStatusBySaleOrderCode orderCode must not be null"); + throw new BusinessException("销售订单编码"); + } else if (Objects.equals(attachAuditStatus, null)) { + LOGGER.info("OrderRest.updateAttachAuditStatusBySaleOrderCode attachAuditStatus must not be null"); + throw new BusinessException("销售订单附件审核状态"); + } + try { + result.setData(orderService.updateAttachAuditStatusBySaleOrderCode(orderCode, attachAuditStatus)); + } catch (Exception e) { + LOGGER.error("OrderRest updateAttachAuditStatusBySaleOrderCode error: {}", e); + throw new BusinessException(e.getMessage()); + } + return result; + } + } diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderAttachViewBO.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderAttachViewBO.java new file mode 100644 index 0000000..581edec --- /dev/null +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderAttachViewBO.java @@ -0,0 +1,53 @@ +package com.unlcn.ils.sales.backend.bo; + +/** + * Created by houjianhui on 2017/8/15. + */ +public class OrderAttachViewBO { + private Integer id; + private String picKey; + private Integer saleOrderId; + private String url; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getPicKey() { + return picKey; + } + + public void setPicKey(String picKey) { + this.picKey = picKey; + } + + public Integer getSaleOrderId() { + return saleOrderId; + } + + public void setSaleOrderId(Integer saleOrderId) { + this.saleOrderId = saleOrderId; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + @Override + public String toString() { + return "OrderAttachViewBO{" + + "id=" + id + + ", picKey='" + picKey + '\'' + + ", saleOrderId=" + saleOrderId + + ", url='" + url + '\'' + + '}'; + } +} diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java index 84fe76b..31c8039 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java @@ -24,10 +24,12 @@ public class OrderViewBO { private BigDecimal finalSalePrice; private BigDecimal finalPurchasePrice; private Integer orderStatus; + private Integer attachAuditStatus; private Integer auditStatus; private Integer auditId; private String comment; private String auditComment; + private String attachAuditStatusText; // 销售订单地址表 private String departRegionCode; @@ -44,6 +46,8 @@ public class OrderViewBO { // 销售订单商品车表 private List orderSkus; + private List attachs; + public Integer getId() { return id; } @@ -260,6 +264,30 @@ public class OrderViewBO { this.gmtCreate = gmtCreate; } + public Integer getAttachAuditStatus() { + return attachAuditStatus; + } + + public void setAttachAuditStatus(Integer attachAuditStatus) { + this.attachAuditStatus = attachAuditStatus; + } + + public String getAttachAuditStatusText() { + return attachAuditStatusText; + } + + public void setAttachAuditStatusText(String attachAuditStatusText) { + this.attachAuditStatusText = attachAuditStatusText; + } + + public List getAttachs() { + return attachs; + } + + public void setAttachs(List attachs) { + this.attachs = attachs; + } + @Override public String toString() { return "OrderViewBO{" + @@ -275,10 +303,12 @@ public class OrderViewBO { ", finalSalePrice=" + finalSalePrice + ", finalPurchasePrice=" + finalPurchasePrice + ", orderStatus=" + orderStatus + + ", attachAuditStatus=" + attachAuditStatus + ", auditStatus=" + auditStatus + ", auditId=" + auditId + ", comment='" + comment + '\'' + ", auditComment='" + auditComment + '\'' + + ", attachAuditStatusText='" + attachAuditStatusText + '\'' + ", departRegionCode='" + departRegionCode + '\'' + ", departRegionName='" + departRegionName + '\'' + ", departContact='" + departContact + '\'' + @@ -290,6 +320,7 @@ public class OrderViewBO { ", distance=" + distance + ", gmtCreate=" + gmtCreate + ", orderSkus=" + orderSkus + + ", attachs=" + attachs + '}'; } } diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/enums/AttachAuditStatusEnum.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/enums/AttachAuditStatusEnum.java new file mode 100644 index 0000000..89a5274 --- /dev/null +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/enums/AttachAuditStatusEnum.java @@ -0,0 +1,37 @@ +package com.unlcn.ils.sales.backend.enums; + +/** + * Created by houjianhui on 2017/6/10. + */ +public enum AttachAuditStatusEnum { + + ORDER_INIT(10, "未提交"), + ORDER_SUBMIT(20, "已提交"), + ORDER_PASS(20, "已通过"), + ORDER_REFUSE(30, "未通过"); + + private final int value; + private final String text; + + AttachAuditStatusEnum(int value, String text) { + this.value = value; + this.text = text; + } + + public int getValue() { + return value; + } + + public String getText() { + return text; + } + + public static AttachAuditStatusEnum getByValue(int value){ + for (AttachAuditStatusEnum temp : AttachAuditStatusEnum.values()) { + if(temp.getValue() == value){ + return temp; + } + } + return null; + } +} diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAttachService.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAttachService.java new file mode 100644 index 0000000..adaaeb4 --- /dev/null +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAttachService.java @@ -0,0 +1,26 @@ +package com.unlcn.ils.sales.backend.service; + +/** + * Created by houjianhui on 2017/8/14. + */ +public interface OrderAttachService { + + /** + * 保存销售订单附件 + * + * @param attach 附件JSON字符串 + * @param saleOrderId 销售订单ID + * @return + * @throws Exception + */ + int save(String attach, Integer saleOrderId) throws Exception; + + /** + * 根据销售订单ID删除销售订单附件信息 + * + * @param saleOrderId 销售订单ID + * @return + * @throws Exception + */ + int deleteAttachBySaleOrderId(Integer saleOrderId) throws Exception; +} diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAttachServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAttachServiceImpl.java new file mode 100644 index 0000000..4d68b01 --- /dev/null +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAttachServiceImpl.java @@ -0,0 +1,70 @@ +package com.unlcn.ils.sales.backend.service; + +import com.alibaba.fastjson.JSONArray; +import com.unlcn.ils.sales.base.mapper.SaleOrderAttachMapper; +import com.unlcn.ils.sales.base.model.SaleOrderAttach; +import com.unlcn.ils.sales.base.model.SaleOrderAttachExample; +import org.apache.commons.collections4.CollectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; + +/** + * Created by houjianhui on 2017/8/14. + */ +@Service +public class OrderAttachServiceImpl implements OrderAttachService{ + + private static final Logger LOGGER = LoggerFactory.getLogger(OrderAttachServiceImpl.class); + + @Autowired + private SaleOrderAttachMapper saleOrderAttachMapper; + + @Override + public int save(String attach, Integer saleOrderId) throws Exception { + if (Objects.equals(attach, null) || Objects.equals(attach, "")) { + LOGGER.info("OrderAttachServiceImpl.save param attach must not be null"); + throw new IllegalArgumentException("销售订单附件信息不能为空"); + } else if (Objects.equals(saleOrderId, null) || Objects.equals(saleOrderId, 0)) { + LOGGER.info("OrderAttachServiceImpl.save param saleOrderId must not be null"); + throw new IllegalArgumentException("销售订单主键不能为空"); + } + + // 删除历史附件信息 + deleteAttachBySaleOrderId(saleOrderId); + + // 插入最新附件信息 + List attachs = JSONArray.parseArray(attach, String.class); + if (CollectionUtils.isNotEmpty(attachs)) { + SaleOrderAttach orderAttach = new SaleOrderAttach(); + orderAttach.setSaleOrderId(saleOrderId); + attachs.stream().forEach(item -> { + orderAttach.setPicKey(item); + saleOrderAttachMapper.insertSelective(orderAttach); + }); + } + return 0; + } + + @Override + public int deleteAttachBySaleOrderId(Integer saleOrderId) throws Exception { + if (Objects.equals(saleOrderId, null) || Objects.equals(saleOrderId, "") || Objects.equals(saleOrderId, 0)) { + LOGGER.info("OrderAttachServiceImpl.deleteAttachBySaleOrderId param saleOrderId must not be null"); + throw new IllegalArgumentException("销售订单主键不能为空"); + } + SaleOrderAttachExample example = new SaleOrderAttachExample(); + example.createCriteria().andSaleOrderIdEqualTo(saleOrderId).andDeleteMarkEqualTo(true); + List attaches = saleOrderAttachMapper.selectByExample(example); + if (CollectionUtils.isNotEmpty(attaches)) { + attaches.stream().forEach(item -> { + item.setDeleteMark(false); + saleOrderAttachMapper.updateByPrimaryKeySelective(item); + }); + } + return 0; + } +} diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderService.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderService.java index 4773dd9..d06c07a 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderService.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderService.java @@ -89,4 +89,14 @@ public interface OrderService { */ Integer updateSaleOrderStatusByKyleOrderStatus() throws Exception; + /** + * 更新销售订单附件审核状态 + * + * @param orderCode 订单编号 + * @param attachAuditStatus 状态 + * @return + * @throws Exception + */ + Integer updateAttachAuditStatusBySaleOrderCode(String orderCode, Integer attachAuditStatus) throws Exception; + } diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java index 403f0fa..ff33b97 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java @@ -4,18 +4,17 @@ import cn.huiyunche.commons.domain.PageVo; import cn.huiyunche.commons.exception.BusinessException; import cn.huiyunche.commons.utils.HttpRequestUtil; import cn.huiyunche.commons.utils.PropertiesUtil; +import cn.huiyunche.commons.utils.QiniuUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import com.unlcn.ils.sales.backend.bo.*; +import com.unlcn.ils.sales.backend.enums.AttachAuditStatusEnum; import com.unlcn.ils.sales.backend.enums.OrderStatusEnum; import com.unlcn.ils.sales.backend.util.UniquenessUtil; import com.unlcn.ils.sales.base.mapper.SaleOrderMapper; import com.unlcn.ils.sales.base.mapper.SaleOrderViewMapper; -import com.unlcn.ils.sales.base.model.OrderSkuViewDAO; -import com.unlcn.ils.sales.base.model.OrderViewDAO; -import com.unlcn.ils.sales.base.model.SaleOrder; -import com.unlcn.ils.sales.base.model.SaleOrderExample; +import com.unlcn.ils.sales.base.model.*; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -199,6 +198,27 @@ public class OrderServiceImpl implements OrderService { return null; } + @Override + public Integer updateAttachAuditStatusBySaleOrderCode(String orderCode, Integer attachAuditStatus) throws Exception { + if (StringUtils.isBlank(orderCode)) { + LOGGER.info("OrderServiceImpl.updateAttachAuditStatusBySaleOrderCode param orderCode must not be null"); + throw new IllegalArgumentException("销售订单编码不能为空"); + } else if (Objects.equals(attachAuditStatus, null) || Objects.equals(attachAuditStatus, "") || Objects.equals(attachAuditStatus, 0)) { + LOGGER.info("OrderServiceImpl.updateAttachAuditStatusBySaleOrderCode param attachAuditStatus must not be null"); + throw new IllegalArgumentException("销售订单附件审核状态不能为空"); + } + SaleOrderExample example = new SaleOrderExample(); + example.createCriteria().andCodeEqualTo(orderCode); + List orders = orderMapper.selectByExample(example); + if (CollectionUtils.isNotEmpty(orders)) { + orders.stream().forEach(item -> { + item.setAttachAuditStatus(AttachAuditStatusEnum.getByValue(attachAuditStatus).getValue()); + orderMapper.updateByPrimaryKeySelective(item); + }); + } + return 0; + } + private Map buildListSaleOrder(Map queryMap, PageVo pageVo) throws Exception { String auditStatus = (String) queryMap.get("auditStatus"); if (StringUtils.isNotBlank(auditStatus)) { @@ -253,8 +273,10 @@ public class OrderServiceImpl implements OrderService { OrderViewDAO dao = orderViewMapper.getSaleOrderDetail(queryMap); OrderViewBO bo = new OrderViewBO(); BeanUtils.copyProperties(dao, bo); + // SKU List skuViewDTOS = dao.getOrderSkus(); List skuBOS = Lists.newArrayList(); + if (CollectionUtils.isNotEmpty(skuViewDTOS)) { skuViewDTOS.stream().forEach(va -> { OrderSkuBO skuBO = new OrderSkuBO(); @@ -262,6 +284,20 @@ public class OrderServiceImpl implements OrderService { skuBOS.add(skuBO); }); } + + // attach + List attachs= dao.getAttachs(); + List attachViewBOS = Lists.newArrayList(); + + if (CollectionUtils.isNotEmpty(attachs)) { + attachs.stream().forEach(item -> { + OrderAttachViewBO attachViewBO = new OrderAttachViewBO(); + BeanUtils.copyProperties(item, attachViewBO); + attachViewBO.setUrl(QiniuUtil.generateDownloadURL(item.getPicKey(), "")); + attachViewBOS.add(attachViewBO); + }); + } + bo.setAttachs(attachViewBOS); bo.setOrderSkus(skuBOS); return bo; } catch (Exception e) { @@ -291,6 +327,7 @@ public class OrderServiceImpl implements OrderService { }); } bo.setOrderSkus(skuBOS); + bo.setAttachAuditStatusText(AttachAuditStatusEnum.getByValue(bo.getAttachAuditStatus()).getText()); orderViewBOS.add(bo); }); return orderViewBOS; diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderAttachMapper.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderAttachMapper.java new file mode 100644 index 0000000..22fd1d8 --- /dev/null +++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderAttachMapper.java @@ -0,0 +1,96 @@ +package com.unlcn.ils.sales.base.mapper; + +import com.unlcn.ils.sales.base.model.SaleOrderAttach; +import com.unlcn.ils.sales.base.model.SaleOrderAttachExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SaleOrderAttachMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + int countByExample(SaleOrderAttachExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + int deleteByExample(SaleOrderAttachExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + int deleteByPrimaryKey(Integer id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + int insert(SaleOrderAttach record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + int insertSelective(SaleOrderAttach record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + List selectByExample(SaleOrderAttachExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + SaleOrderAttach selectByPrimaryKey(Integer id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + int updateByExampleSelective(@Param("record") SaleOrderAttach record, @Param("example") SaleOrderAttachExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + int updateByExample(@Param("record") SaleOrderAttach record, @Param("example") SaleOrderAttachExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + int updateByPrimaryKeySelective(SaleOrderAttach record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + int updateByPrimaryKey(SaleOrderAttach record); +} \ No newline at end of file diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderMapper.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderMapper.java index a2843b6..f430796 100644 --- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderMapper.java +++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderMapper.java @@ -10,7 +10,7 @@ public interface SaleOrderMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ int countByExample(SaleOrderExample example); @@ -18,7 +18,7 @@ public interface SaleOrderMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ int deleteByExample(SaleOrderExample example); @@ -26,7 +26,7 @@ public interface SaleOrderMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ int deleteByPrimaryKey(Integer id); @@ -34,7 +34,7 @@ public interface SaleOrderMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ int insert(SaleOrder record); @@ -42,7 +42,7 @@ public interface SaleOrderMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ int insertSelective(SaleOrder record); @@ -50,7 +50,7 @@ public interface SaleOrderMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ List selectByExample(SaleOrderExample example); @@ -58,7 +58,7 @@ public interface SaleOrderMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ SaleOrder selectByPrimaryKey(Integer id); @@ -66,7 +66,7 @@ public interface SaleOrderMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ int updateByExampleSelective(@Param("record") SaleOrder record, @Param("example") SaleOrderExample example); @@ -74,7 +74,7 @@ public interface SaleOrderMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ int updateByExample(@Param("record") SaleOrder record, @Param("example") SaleOrderExample example); @@ -82,7 +82,7 @@ public interface SaleOrderMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ int updateByPrimaryKeySelective(SaleOrder record); @@ -90,7 +90,7 @@ public interface SaleOrderMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ int updateByPrimaryKey(SaleOrder record); } \ No newline at end of file diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderAttachViewDAO.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderAttachViewDAO.java new file mode 100644 index 0000000..9ac96bd --- /dev/null +++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderAttachViewDAO.java @@ -0,0 +1,43 @@ +package com.unlcn.ils.sales.base.model; + +/** + * Created by houjianhui on 2017/8/15. + */ +public class OrderAttachViewDAO { + private Integer id; + private String picKey; + private Integer saleOrderId; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getPicKey() { + return picKey; + } + + public void setPicKey(String picKey) { + this.picKey = picKey; + } + + public Integer getSaleOrderId() { + return saleOrderId; + } + + public void setSaleOrderId(Integer saleOrderId) { + this.saleOrderId = saleOrderId; + } + + @Override + public String toString() { + return "OrderAttachViewDAO{" + + "id=" + id + + ", picKey='" + picKey + '\'' + + ", saleOrderId=" + saleOrderId + + '}'; + } +} diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java index 44e5272..c81ec16 100644 --- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java +++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java @@ -25,12 +25,14 @@ public class OrderViewDAO { private BigDecimal insuranceUnitPrice; private BigDecimal finalPurchasePrice; private Integer orderStatus; + private Integer attachAuditStatus; private Integer auditStatus; private Integer auditId; private Date gmtCreate; private Date gmtUpdate; private String comment; private String auditComment; + private String attachAuditStatusText; // 销售订单地址表 private String departRegionCode; @@ -46,6 +48,8 @@ public class OrderViewDAO { // 销售订单商品车表 private List orderSkus; + private List attachs; + public Integer getId() { return id; } @@ -286,6 +290,30 @@ public class OrderViewDAO { this.auditId = auditId; } + public Integer getAttachAuditStatus() { + return attachAuditStatus; + } + + public void setAttachAuditStatus(Integer attachAuditStatus) { + this.attachAuditStatus = attachAuditStatus; + } + + public String getAttachAuditStatusText() { + return attachAuditStatusText; + } + + public void setAttachAuditStatusText(String attachAuditStatusText) { + this.attachAuditStatusText = attachAuditStatusText; + } + + public List getAttachs() { + return attachs; + } + + public void setAttachs(List attachs) { + this.attachs = attachs; + } + @Override public String toString() { return "OrderViewDAO{" + @@ -303,12 +331,14 @@ public class OrderViewDAO { ", insuranceUnitPrice=" + insuranceUnitPrice + ", finalPurchasePrice=" + finalPurchasePrice + ", orderStatus=" + orderStatus + + ", attachAuditStatus=" + attachAuditStatus + ", auditStatus=" + auditStatus + ", auditId=" + auditId + ", gmtCreate=" + gmtCreate + ", gmtUpdate=" + gmtUpdate + ", comment='" + comment + '\'' + ", auditComment='" + auditComment + '\'' + + ", attachAuditStatusText='" + attachAuditStatusText + '\'' + ", departRegionCode='" + departRegionCode + '\'' + ", departRegionName='" + departRegionName + '\'' + ", departContact='" + departContact + '\'' + @@ -319,6 +349,7 @@ public class OrderViewDAO { ", destPhone='" + destPhone + '\'' + ", distance=" + distance + ", orderSkus=" + orderSkus + + ", attachs=" + attachs + '}'; } } diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrder.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrder.java index 70ef5cc..b6c4ca6 100644 --- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrder.java +++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrder.java @@ -9,7 +9,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.id * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private Integer id; @@ -17,7 +17,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.code * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private String code; @@ -25,7 +25,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.user_id * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private Integer userId; @@ -33,7 +33,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.pick_date * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private Date pickDate; @@ -41,7 +41,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.brands * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private Integer brands; @@ -49,7 +49,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.series_amt * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private Integer seriesAmt; @@ -57,7 +57,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.standard_sale_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private BigDecimal standardSalePrice; @@ -65,7 +65,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.standard_unit_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private BigDecimal standardUnitPrice; @@ -73,7 +73,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.suggest_sale_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private BigDecimal suggestSalePrice; @@ -81,7 +81,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.final_sale_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private BigDecimal finalSalePrice; @@ -89,7 +89,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.final_purchase_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private BigDecimal finalPurchasePrice; @@ -97,7 +97,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.insurance_sale_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private BigDecimal insuranceSalePrice; @@ -105,7 +105,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.insurance_unit_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private BigDecimal insuranceUnitPrice; @@ -113,15 +113,23 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.order_status * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private Integer orderStatus; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column sale_order.attach_audit_status + * + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 + */ + private Integer attachAuditStatus; + /** * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.comment * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private String comment; @@ -129,7 +137,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.delete_mark * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private Boolean deleteMark; @@ -137,7 +145,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.gmt_create * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private Date gmtCreate; @@ -145,7 +153,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database column sale_order.gmt_update * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private Date gmtUpdate; @@ -153,7 +161,7 @@ public class SaleOrder implements Serializable { * This field was generated by MyBatis Generator. * This field corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ private static final long serialVersionUID = 1L; @@ -163,7 +171,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.id * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public Integer getId() { return id; @@ -175,7 +183,7 @@ public class SaleOrder implements Serializable { * * @param id the value for sale_order.id * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setId(Integer id) { this.id = id; @@ -187,7 +195,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.code * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public String getCode() { return code; @@ -199,7 +207,7 @@ public class SaleOrder implements Serializable { * * @param code the value for sale_order.code * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setCode(String code) { this.code = code == null ? null : code.trim(); @@ -211,7 +219,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.user_id * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public Integer getUserId() { return userId; @@ -223,7 +231,7 @@ public class SaleOrder implements Serializable { * * @param userId the value for sale_order.user_id * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setUserId(Integer userId) { this.userId = userId; @@ -235,7 +243,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.pick_date * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public Date getPickDate() { return pickDate; @@ -247,7 +255,7 @@ public class SaleOrder implements Serializable { * * @param pickDate the value for sale_order.pick_date * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setPickDate(Date pickDate) { this.pickDate = pickDate; @@ -259,7 +267,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.brands * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public Integer getBrands() { return brands; @@ -271,7 +279,7 @@ public class SaleOrder implements Serializable { * * @param brands the value for sale_order.brands * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setBrands(Integer brands) { this.brands = brands; @@ -283,7 +291,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.series_amt * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public Integer getSeriesAmt() { return seriesAmt; @@ -295,7 +303,7 @@ public class SaleOrder implements Serializable { * * @param seriesAmt the value for sale_order.series_amt * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setSeriesAmt(Integer seriesAmt) { this.seriesAmt = seriesAmt; @@ -307,7 +315,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.standard_sale_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public BigDecimal getStandardSalePrice() { return standardSalePrice; @@ -319,7 +327,7 @@ public class SaleOrder implements Serializable { * * @param standardSalePrice the value for sale_order.standard_sale_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setStandardSalePrice(BigDecimal standardSalePrice) { this.standardSalePrice = standardSalePrice; @@ -331,7 +339,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.standard_unit_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public BigDecimal getStandardUnitPrice() { return standardUnitPrice; @@ -343,7 +351,7 @@ public class SaleOrder implements Serializable { * * @param standardUnitPrice the value for sale_order.standard_unit_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setStandardUnitPrice(BigDecimal standardUnitPrice) { this.standardUnitPrice = standardUnitPrice; @@ -355,7 +363,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.suggest_sale_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public BigDecimal getSuggestSalePrice() { return suggestSalePrice; @@ -367,7 +375,7 @@ public class SaleOrder implements Serializable { * * @param suggestSalePrice the value for sale_order.suggest_sale_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setSuggestSalePrice(BigDecimal suggestSalePrice) { this.suggestSalePrice = suggestSalePrice; @@ -379,7 +387,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.final_sale_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public BigDecimal getFinalSalePrice() { return finalSalePrice; @@ -391,7 +399,7 @@ public class SaleOrder implements Serializable { * * @param finalSalePrice the value for sale_order.final_sale_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setFinalSalePrice(BigDecimal finalSalePrice) { this.finalSalePrice = finalSalePrice; @@ -403,7 +411,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.final_purchase_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public BigDecimal getFinalPurchasePrice() { return finalPurchasePrice; @@ -415,7 +423,7 @@ public class SaleOrder implements Serializable { * * @param finalPurchasePrice the value for sale_order.final_purchase_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setFinalPurchasePrice(BigDecimal finalPurchasePrice) { this.finalPurchasePrice = finalPurchasePrice; @@ -427,7 +435,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.insurance_sale_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public BigDecimal getInsuranceSalePrice() { return insuranceSalePrice; @@ -439,7 +447,7 @@ public class SaleOrder implements Serializable { * * @param insuranceSalePrice the value for sale_order.insurance_sale_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setInsuranceSalePrice(BigDecimal insuranceSalePrice) { this.insuranceSalePrice = insuranceSalePrice; @@ -451,7 +459,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.insurance_unit_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public BigDecimal getInsuranceUnitPrice() { return insuranceUnitPrice; @@ -463,7 +471,7 @@ public class SaleOrder implements Serializable { * * @param insuranceUnitPrice the value for sale_order.insurance_unit_price * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setInsuranceUnitPrice(BigDecimal insuranceUnitPrice) { this.insuranceUnitPrice = insuranceUnitPrice; @@ -475,7 +483,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.order_status * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public Integer getOrderStatus() { return orderStatus; @@ -487,19 +495,43 @@ public class SaleOrder implements Serializable { * * @param orderStatus the value for sale_order.order_status * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setOrderStatus(Integer orderStatus) { this.orderStatus = orderStatus; } + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column sale_order.attach_audit_status + * + * @return the value of sale_order.attach_audit_status + * + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 + */ + public Integer getAttachAuditStatus() { + return attachAuditStatus; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column sale_order.attach_audit_status + * + * @param attachAuditStatus the value for sale_order.attach_audit_status + * + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 + */ + public void setAttachAuditStatus(Integer attachAuditStatus) { + this.attachAuditStatus = attachAuditStatus; + } + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column sale_order.comment * * @return the value of sale_order.comment * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public String getComment() { return comment; @@ -511,7 +543,7 @@ public class SaleOrder implements Serializable { * * @param comment the value for sale_order.comment * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setComment(String comment) { this.comment = comment == null ? null : comment.trim(); @@ -523,7 +555,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.delete_mark * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public Boolean getDeleteMark() { return deleteMark; @@ -535,7 +567,7 @@ public class SaleOrder implements Serializable { * * @param deleteMark the value for sale_order.delete_mark * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setDeleteMark(Boolean deleteMark) { this.deleteMark = deleteMark; @@ -547,7 +579,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.gmt_create * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public Date getGmtCreate() { return gmtCreate; @@ -559,7 +591,7 @@ public class SaleOrder implements Serializable { * * @param gmtCreate the value for sale_order.gmt_create * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setGmtCreate(Date gmtCreate) { this.gmtCreate = gmtCreate; @@ -571,7 +603,7 @@ public class SaleOrder implements Serializable { * * @return the value of sale_order.gmt_update * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public Date getGmtUpdate() { return gmtUpdate; @@ -583,7 +615,7 @@ public class SaleOrder implements Serializable { * * @param gmtUpdate the value for sale_order.gmt_update * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setGmtUpdate(Date gmtUpdate) { this.gmtUpdate = gmtUpdate; @@ -593,7 +625,7 @@ public class SaleOrder implements Serializable { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ @Override public String toString() { @@ -615,6 +647,7 @@ public class SaleOrder implements Serializable { sb.append(", insuranceSalePrice=").append(insuranceSalePrice); sb.append(", insuranceUnitPrice=").append(insuranceUnitPrice); sb.append(", orderStatus=").append(orderStatus); + sb.append(", attachAuditStatus=").append(attachAuditStatus); sb.append(", comment=").append(comment); sb.append(", deleteMark=").append(deleteMark); sb.append(", gmtCreate=").append(gmtCreate); diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAttach.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAttach.java new file mode 100644 index 0000000..2d888f2 --- /dev/null +++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAttach.java @@ -0,0 +1,228 @@ +package com.unlcn.ils.sales.base.model; + +import java.io.Serializable; +import java.util.Date; + +public class SaleOrderAttach implements Serializable { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column sale_order_attach.id + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + private Integer id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column sale_order_attach.sale_order_id + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + private Integer saleOrderId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column sale_order_attach.pic_key + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + private String picKey; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column sale_order_attach.delete_mark + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + private Boolean deleteMark; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column sale_order_attach.gmt_create + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + private Date gmtCreate; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column sale_order_attach.gmt_update + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + private Date gmtUpdate; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + private static final long serialVersionUID = 1L; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column sale_order_attach.id + * + * @return the value of sale_order_attach.id + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public Integer getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column sale_order_attach.id + * + * @param id the value for sale_order_attach.id + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column sale_order_attach.sale_order_id + * + * @return the value of sale_order_attach.sale_order_id + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public Integer getSaleOrderId() { + return saleOrderId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column sale_order_attach.sale_order_id + * + * @param saleOrderId the value for sale_order_attach.sale_order_id + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public void setSaleOrderId(Integer saleOrderId) { + this.saleOrderId = saleOrderId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column sale_order_attach.pic_key + * + * @return the value of sale_order_attach.pic_key + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public String getPicKey() { + return picKey; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column sale_order_attach.pic_key + * + * @param picKey the value for sale_order_attach.pic_key + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public void setPicKey(String picKey) { + this.picKey = picKey == null ? null : picKey.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column sale_order_attach.delete_mark + * + * @return the value of sale_order_attach.delete_mark + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public Boolean getDeleteMark() { + return deleteMark; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column sale_order_attach.delete_mark + * + * @param deleteMark the value for sale_order_attach.delete_mark + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public void setDeleteMark(Boolean deleteMark) { + this.deleteMark = deleteMark; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column sale_order_attach.gmt_create + * + * @return the value of sale_order_attach.gmt_create + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public Date getGmtCreate() { + return gmtCreate; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column sale_order_attach.gmt_create + * + * @param gmtCreate the value for sale_order_attach.gmt_create + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public void setGmtCreate(Date gmtCreate) { + this.gmtCreate = gmtCreate; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column sale_order_attach.gmt_update + * + * @return the value of sale_order_attach.gmt_update + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public Date getGmtUpdate() { + return gmtUpdate; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column sale_order_attach.gmt_update + * + * @param gmtUpdate the value for sale_order_attach.gmt_update + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public void setGmtUpdate(Date gmtUpdate) { + this.gmtUpdate = gmtUpdate; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", saleOrderId=").append(saleOrderId); + sb.append(", picKey=").append(picKey); + sb.append(", deleteMark=").append(deleteMark); + sb.append(", gmtCreate=").append(gmtCreate); + sb.append(", gmtUpdate=").append(gmtUpdate); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAttachExample.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAttachExample.java new file mode 100644 index 0000000..97cf974 --- /dev/null +++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAttachExample.java @@ -0,0 +1,734 @@ +package com.unlcn.ils.sales.base.model; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class SaleOrderAttachExample { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + protected String orderByClause; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + protected boolean distinct; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + protected List oredCriteria; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + protected int limitStart = -1; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + protected int limitEnd = -1; + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public SaleOrderAttachExample() { + oredCriteria = new ArrayList(); + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public String getOrderByClause() { + return orderByClause; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public boolean isDistinct() { + return distinct; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public List getOredCriteria() { + return oredCriteria; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public void setLimitStart(int limitStart) { + this.limitStart=limitStart; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public int getLimitStart() { + return limitStart; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public void setLimitEnd(int limitEnd) { + this.limitEnd=limitEnd; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public int getLimitEnd() { + return limitEnd; + } + + /** + * This class was generated by MyBatis Generator. + * This class corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Integer value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Integer value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Integer value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Integer value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Integer value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Integer value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Integer value1, Integer value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Integer value1, Integer value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andSaleOrderIdIsNull() { + addCriterion("sale_order_id is null"); + return (Criteria) this; + } + + public Criteria andSaleOrderIdIsNotNull() { + addCriterion("sale_order_id is not null"); + return (Criteria) this; + } + + public Criteria andSaleOrderIdEqualTo(Integer value) { + addCriterion("sale_order_id =", value, "saleOrderId"); + return (Criteria) this; + } + + public Criteria andSaleOrderIdNotEqualTo(Integer value) { + addCriterion("sale_order_id <>", value, "saleOrderId"); + return (Criteria) this; + } + + public Criteria andSaleOrderIdGreaterThan(Integer value) { + addCriterion("sale_order_id >", value, "saleOrderId"); + return (Criteria) this; + } + + public Criteria andSaleOrderIdGreaterThanOrEqualTo(Integer value) { + addCriterion("sale_order_id >=", value, "saleOrderId"); + return (Criteria) this; + } + + public Criteria andSaleOrderIdLessThan(Integer value) { + addCriterion("sale_order_id <", value, "saleOrderId"); + return (Criteria) this; + } + + public Criteria andSaleOrderIdLessThanOrEqualTo(Integer value) { + addCriterion("sale_order_id <=", value, "saleOrderId"); + return (Criteria) this; + } + + public Criteria andSaleOrderIdIn(List values) { + addCriterion("sale_order_id in", values, "saleOrderId"); + return (Criteria) this; + } + + public Criteria andSaleOrderIdNotIn(List values) { + addCriterion("sale_order_id not in", values, "saleOrderId"); + return (Criteria) this; + } + + public Criteria andSaleOrderIdBetween(Integer value1, Integer value2) { + addCriterion("sale_order_id between", value1, value2, "saleOrderId"); + return (Criteria) this; + } + + public Criteria andSaleOrderIdNotBetween(Integer value1, Integer value2) { + addCriterion("sale_order_id not between", value1, value2, "saleOrderId"); + return (Criteria) this; + } + + public Criteria andPicKeyIsNull() { + addCriterion("pic_key is null"); + return (Criteria) this; + } + + public Criteria andPicKeyIsNotNull() { + addCriterion("pic_key is not null"); + return (Criteria) this; + } + + public Criteria andPicKeyEqualTo(String value) { + addCriterion("pic_key =", value, "picKey"); + return (Criteria) this; + } + + public Criteria andPicKeyNotEqualTo(String value) { + addCriterion("pic_key <>", value, "picKey"); + return (Criteria) this; + } + + public Criteria andPicKeyGreaterThan(String value) { + addCriterion("pic_key >", value, "picKey"); + return (Criteria) this; + } + + public Criteria andPicKeyGreaterThanOrEqualTo(String value) { + addCriterion("pic_key >=", value, "picKey"); + return (Criteria) this; + } + + public Criteria andPicKeyLessThan(String value) { + addCriterion("pic_key <", value, "picKey"); + return (Criteria) this; + } + + public Criteria andPicKeyLessThanOrEqualTo(String value) { + addCriterion("pic_key <=", value, "picKey"); + return (Criteria) this; + } + + public Criteria andPicKeyLike(String value) { + addCriterion("pic_key like", value, "picKey"); + return (Criteria) this; + } + + public Criteria andPicKeyNotLike(String value) { + addCriterion("pic_key not like", value, "picKey"); + return (Criteria) this; + } + + public Criteria andPicKeyIn(List values) { + addCriterion("pic_key in", values, "picKey"); + return (Criteria) this; + } + + public Criteria andPicKeyNotIn(List values) { + addCriterion("pic_key not in", values, "picKey"); + return (Criteria) this; + } + + public Criteria andPicKeyBetween(String value1, String value2) { + addCriterion("pic_key between", value1, value2, "picKey"); + return (Criteria) this; + } + + public Criteria andPicKeyNotBetween(String value1, String value2) { + addCriterion("pic_key not between", value1, value2, "picKey"); + return (Criteria) this; + } + + public Criteria andDeleteMarkIsNull() { + addCriterion("delete_mark is null"); + return (Criteria) this; + } + + public Criteria andDeleteMarkIsNotNull() { + addCriterion("delete_mark is not null"); + return (Criteria) this; + } + + public Criteria andDeleteMarkEqualTo(Boolean value) { + addCriterion("delete_mark =", value, "deleteMark"); + return (Criteria) this; + } + + public Criteria andDeleteMarkNotEqualTo(Boolean value) { + addCriterion("delete_mark <>", value, "deleteMark"); + return (Criteria) this; + } + + public Criteria andDeleteMarkGreaterThan(Boolean value) { + addCriterion("delete_mark >", value, "deleteMark"); + return (Criteria) this; + } + + public Criteria andDeleteMarkGreaterThanOrEqualTo(Boolean value) { + addCriterion("delete_mark >=", value, "deleteMark"); + return (Criteria) this; + } + + public Criteria andDeleteMarkLessThan(Boolean value) { + addCriterion("delete_mark <", value, "deleteMark"); + return (Criteria) this; + } + + public Criteria andDeleteMarkLessThanOrEqualTo(Boolean value) { + addCriterion("delete_mark <=", value, "deleteMark"); + return (Criteria) this; + } + + public Criteria andDeleteMarkIn(List values) { + addCriterion("delete_mark in", values, "deleteMark"); + return (Criteria) this; + } + + public Criteria andDeleteMarkNotIn(List values) { + addCriterion("delete_mark not in", values, "deleteMark"); + return (Criteria) this; + } + + public Criteria andDeleteMarkBetween(Boolean value1, Boolean value2) { + addCriterion("delete_mark between", value1, value2, "deleteMark"); + return (Criteria) this; + } + + public Criteria andDeleteMarkNotBetween(Boolean value1, Boolean value2) { + addCriterion("delete_mark not between", value1, value2, "deleteMark"); + return (Criteria) this; + } + + public Criteria andGmtCreateIsNull() { + addCriterion("gmt_create is null"); + return (Criteria) this; + } + + public Criteria andGmtCreateIsNotNull() { + addCriterion("gmt_create is not null"); + return (Criteria) this; + } + + public Criteria andGmtCreateEqualTo(Date value) { + addCriterion("gmt_create =", value, "gmtCreate"); + return (Criteria) this; + } + + public Criteria andGmtCreateNotEqualTo(Date value) { + addCriterion("gmt_create <>", value, "gmtCreate"); + return (Criteria) this; + } + + public Criteria andGmtCreateGreaterThan(Date value) { + addCriterion("gmt_create >", value, "gmtCreate"); + return (Criteria) this; + } + + public Criteria andGmtCreateGreaterThanOrEqualTo(Date value) { + addCriterion("gmt_create >=", value, "gmtCreate"); + return (Criteria) this; + } + + public Criteria andGmtCreateLessThan(Date value) { + addCriterion("gmt_create <", value, "gmtCreate"); + return (Criteria) this; + } + + public Criteria andGmtCreateLessThanOrEqualTo(Date value) { + addCriterion("gmt_create <=", value, "gmtCreate"); + return (Criteria) this; + } + + public Criteria andGmtCreateIn(List values) { + addCriterion("gmt_create in", values, "gmtCreate"); + return (Criteria) this; + } + + public Criteria andGmtCreateNotIn(List values) { + addCriterion("gmt_create not in", values, "gmtCreate"); + return (Criteria) this; + } + + public Criteria andGmtCreateBetween(Date value1, Date value2) { + addCriterion("gmt_create between", value1, value2, "gmtCreate"); + return (Criteria) this; + } + + public Criteria andGmtCreateNotBetween(Date value1, Date value2) { + addCriterion("gmt_create not between", value1, value2, "gmtCreate"); + return (Criteria) this; + } + + public Criteria andGmtUpdateIsNull() { + addCriterion("gmt_update is null"); + return (Criteria) this; + } + + public Criteria andGmtUpdateIsNotNull() { + addCriterion("gmt_update is not null"); + return (Criteria) this; + } + + public Criteria andGmtUpdateEqualTo(Date value) { + addCriterion("gmt_update =", value, "gmtUpdate"); + return (Criteria) this; + } + + public Criteria andGmtUpdateNotEqualTo(Date value) { + addCriterion("gmt_update <>", value, "gmtUpdate"); + return (Criteria) this; + } + + public Criteria andGmtUpdateGreaterThan(Date value) { + addCriterion("gmt_update >", value, "gmtUpdate"); + return (Criteria) this; + } + + public Criteria andGmtUpdateGreaterThanOrEqualTo(Date value) { + addCriterion("gmt_update >=", value, "gmtUpdate"); + return (Criteria) this; + } + + public Criteria andGmtUpdateLessThan(Date value) { + addCriterion("gmt_update <", value, "gmtUpdate"); + return (Criteria) this; + } + + public Criteria andGmtUpdateLessThanOrEqualTo(Date value) { + addCriterion("gmt_update <=", value, "gmtUpdate"); + return (Criteria) this; + } + + public Criteria andGmtUpdateIn(List values) { + addCriterion("gmt_update in", values, "gmtUpdate"); + return (Criteria) this; + } + + public Criteria andGmtUpdateNotIn(List values) { + addCriterion("gmt_update not in", values, "gmtUpdate"); + return (Criteria) this; + } + + public Criteria andGmtUpdateBetween(Date value1, Date value2) { + addCriterion("gmt_update between", value1, value2, "gmtUpdate"); + return (Criteria) this; + } + + public Criteria andGmtUpdateNotBetween(Date value1, Date value2) { + addCriterion("gmt_update not between", value1, value2, "gmtUpdate"); + return (Criteria) this; + } + + public Criteria andPicKeyLikeInsensitive(String value) { + addCriterion("upper(pic_key) like", value.toUpperCase(), "picKey"); + return (Criteria) this; + } + } + + /** + * This class was generated by MyBatis Generator. + * This class corresponds to the database table sale_order_attach + * + * @mbggenerated do_not_delete_during_merge Mon Aug 14 17:17:03 CST 2017 + */ + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + /** + * This class was generated by MyBatis Generator. + * This class corresponds to the database table sale_order_attach + * + * @mbggenerated Mon Aug 14 17:17:03 CST 2017 + */ + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderExample.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderExample.java index 228badc..5046cb2 100644 --- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderExample.java +++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderExample.java @@ -11,7 +11,7 @@ public class SaleOrderExample { * This field was generated by MyBatis Generator. * This field corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ protected String orderByClause; @@ -19,7 +19,7 @@ public class SaleOrderExample { * This field was generated by MyBatis Generator. * This field corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ protected boolean distinct; @@ -27,7 +27,7 @@ public class SaleOrderExample { * This field was generated by MyBatis Generator. * This field corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ protected List oredCriteria; @@ -35,7 +35,7 @@ public class SaleOrderExample { * This field was generated by MyBatis Generator. * This field corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ protected int limitStart = -1; @@ -43,7 +43,7 @@ public class SaleOrderExample { * This field was generated by MyBatis Generator. * This field corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ protected int limitEnd = -1; @@ -51,7 +51,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public SaleOrderExample() { oredCriteria = new ArrayList(); @@ -61,7 +61,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setOrderByClause(String orderByClause) { this.orderByClause = orderByClause; @@ -71,7 +71,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public String getOrderByClause() { return orderByClause; @@ -81,7 +81,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setDistinct(boolean distinct) { this.distinct = distinct; @@ -91,7 +91,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public boolean isDistinct() { return distinct; @@ -101,7 +101,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public List getOredCriteria() { return oredCriteria; @@ -111,7 +111,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void or(Criteria criteria) { oredCriteria.add(criteria); @@ -121,7 +121,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public Criteria or() { Criteria criteria = createCriteriaInternal(); @@ -133,7 +133,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public Criteria createCriteria() { Criteria criteria = createCriteriaInternal(); @@ -147,7 +147,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ protected Criteria createCriteriaInternal() { Criteria criteria = new Criteria(); @@ -158,7 +158,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void clear() { oredCriteria.clear(); @@ -170,7 +170,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setLimitStart(int limitStart) { this.limitStart=limitStart; @@ -180,7 +180,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public int getLimitStart() { return limitStart; @@ -190,7 +190,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public void setLimitEnd(int limitEnd) { this.limitEnd=limitEnd; @@ -200,7 +200,7 @@ public class SaleOrderExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public int getLimitEnd() { return limitEnd; @@ -210,7 +210,7 @@ public class SaleOrderExample { * This class was generated by MyBatis Generator. * This class corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ protected abstract static class GeneratedCriteria { protected List criteria; @@ -1129,6 +1129,66 @@ public class SaleOrderExample { return (Criteria) this; } + public Criteria andAttachAuditStatusIsNull() { + addCriterion("attach_audit_status is null"); + return (Criteria) this; + } + + public Criteria andAttachAuditStatusIsNotNull() { + addCriterion("attach_audit_status is not null"); + return (Criteria) this; + } + + public Criteria andAttachAuditStatusEqualTo(Integer value) { + addCriterion("attach_audit_status =", value, "attachAuditStatus"); + return (Criteria) this; + } + + public Criteria andAttachAuditStatusNotEqualTo(Integer value) { + addCriterion("attach_audit_status <>", value, "attachAuditStatus"); + return (Criteria) this; + } + + public Criteria andAttachAuditStatusGreaterThan(Integer value) { + addCriterion("attach_audit_status >", value, "attachAuditStatus"); + return (Criteria) this; + } + + public Criteria andAttachAuditStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("attach_audit_status >=", value, "attachAuditStatus"); + return (Criteria) this; + } + + public Criteria andAttachAuditStatusLessThan(Integer value) { + addCriterion("attach_audit_status <", value, "attachAuditStatus"); + return (Criteria) this; + } + + public Criteria andAttachAuditStatusLessThanOrEqualTo(Integer value) { + addCriterion("attach_audit_status <=", value, "attachAuditStatus"); + return (Criteria) this; + } + + public Criteria andAttachAuditStatusIn(List values) { + addCriterion("attach_audit_status in", values, "attachAuditStatus"); + return (Criteria) this; + } + + public Criteria andAttachAuditStatusNotIn(List values) { + addCriterion("attach_audit_status not in", values, "attachAuditStatus"); + return (Criteria) this; + } + + public Criteria andAttachAuditStatusBetween(Integer value1, Integer value2) { + addCriterion("attach_audit_status between", value1, value2, "attachAuditStatus"); + return (Criteria) this; + } + + public Criteria andAttachAuditStatusNotBetween(Integer value1, Integer value2) { + addCriterion("attach_audit_status not between", value1, value2, "attachAuditStatus"); + return (Criteria) this; + } + public Criteria andCommentIsNull() { addCriterion("comment is null"); return (Criteria) this; @@ -1394,7 +1454,7 @@ public class SaleOrderExample { * This class was generated by MyBatis Generator. * This class corresponds to the database table sale_order * - * @mbggenerated do_not_delete_during_merge Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated do_not_delete_during_merge Mon Aug 14 16:47:17 CST 2017 */ public static class Criteria extends GeneratedCriteria { @@ -1407,7 +1467,7 @@ public class SaleOrderExample { * This class was generated by MyBatis Generator. * This class corresponds to the database table sale_order * - * @mbggenerated Thu Jun 15 11:10:17 CST 2017 + * @mbggenerated Mon Aug 14 16:47:17 CST 2017 */ public static class Criterion { private String condition; diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderAttachMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderAttachMapper.xml new file mode 100644 index 0000000..4cb033a --- /dev/null +++ b/ils-sales-base/src/main/resources/mappers/SaleOrderAttachMapper.xml @@ -0,0 +1,304 @@ + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + id, sale_order_id, pic_key, delete_mark, gmt_create, gmt_update + + + + + + delete from sale_order_attach + where id = #{id,jdbcType=INTEGER} + + + + delete from sale_order_attach + + + + + + + + SELECT LAST_INSERT_ID() + + insert into sale_order_attach (sale_order_id, pic_key, delete_mark, + gmt_create, gmt_update) + values (#{saleOrderId,jdbcType=INTEGER}, #{picKey,jdbcType=VARCHAR}, #{deleteMark,jdbcType=BIT}, + #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtUpdate,jdbcType=TIMESTAMP}) + + + + + SELECT LAST_INSERT_ID() + + insert into sale_order_attach + + + sale_order_id, + + + pic_key, + + + delete_mark, + + + gmt_create, + + + gmt_update, + + + + + #{saleOrderId,jdbcType=INTEGER}, + + + #{picKey,jdbcType=VARCHAR}, + + + #{deleteMark,jdbcType=BIT}, + + + #{gmtCreate,jdbcType=TIMESTAMP}, + + + #{gmtUpdate,jdbcType=TIMESTAMP}, + + + + + + + update sale_order_attach + + + id = #{record.id,jdbcType=INTEGER}, + + + sale_order_id = #{record.saleOrderId,jdbcType=INTEGER}, + + + pic_key = #{record.picKey,jdbcType=VARCHAR}, + + + delete_mark = #{record.deleteMark,jdbcType=BIT}, + + + gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP}, + + + gmt_update = #{record.gmtUpdate,jdbcType=TIMESTAMP}, + + + + + + + + + update sale_order_attach + set id = #{record.id,jdbcType=INTEGER}, + sale_order_id = #{record.saleOrderId,jdbcType=INTEGER}, + pic_key = #{record.picKey,jdbcType=VARCHAR}, + delete_mark = #{record.deleteMark,jdbcType=BIT}, + gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP}, + gmt_update = #{record.gmtUpdate,jdbcType=TIMESTAMP} + + + + + + + update sale_order_attach + + + sale_order_id = #{saleOrderId,jdbcType=INTEGER}, + + + pic_key = #{picKey,jdbcType=VARCHAR}, + + + delete_mark = #{deleteMark,jdbcType=BIT}, + + + gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, + + + gmt_update = #{gmtUpdate,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=INTEGER} + + + + update sale_order_attach + set sale_order_id = #{saleOrderId,jdbcType=INTEGER}, + pic_key = #{picKey,jdbcType=VARCHAR}, + delete_mark = #{deleteMark,jdbcType=BIT}, + gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, + gmt_update = #{gmtUpdate,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderMapper.xml index 0f536df..7b65001 100644 --- a/ils-sales-base/src/main/resources/mappers/SaleOrderMapper.xml +++ b/ils-sales-base/src/main/resources/mappers/SaleOrderMapper.xml @@ -5,7 +5,7 @@ @@ -21,6 +21,7 @@ + @@ -30,7 +31,7 @@ @@ -64,7 +65,7 @@ @@ -98,17 +99,18 @@ id, code, user_id, pick_date, brands, series_amt, standard_sale_price, standard_unit_price, suggest_sale_price, final_sale_price, final_purchase_price, insurance_sale_price, - insurance_unit_price, order_status, comment, delete_mark, gmt_create, gmt_update + insurance_unit_price, order_status, attach_audit_status, comment, delete_mark, gmt_create, + gmt_update SELECT sos.brand_id AS brandId, @@ -195,6 +205,18 @@ AND sos.sale_order_id = #{id} + + - SELECT soa.id AS id, soa.pic_key AS picKey, -- Gitee From ffdbcd20ea64c06608f89286b675b8c11494f67b Mon Sep 17 00:00:00 2001 From: zhaoguixin <306743062@qq.com> Date: Thu, 17 Aug 2017 10:16:31 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ils-sales-api/config/dev.properties | 58 ---------------- ils-sales-api/config/production.properties | 56 ---------------- ils-sales-api/config/uat.properties | 53 --------------- .../src/main/resources/constant.properties | 58 ---------------- .../webapp/META-INF/autoconf/auto-config.xml | 9 +-- .../main/webapp/META-INF/autoconf/config.vm | 6 -- ils-sales-backend/config/dev.properties | 4 +- ils-sales-web/config/dev.properties | 66 ------------------- ils-sales-web/config/production.properties | 62 ----------------- ils-sales-web/config/uat.properties | 60 ----------------- .../src/main/resources/constant.properties | 66 ------------------- .../webapp/META-INF/autoconf/auto-config.xml | 9 +-- .../main/webapp/META-INF/autoconf/config.vm | 7 -- 13 files changed, 4 insertions(+), 510 deletions(-) diff --git a/ils-sales-api/config/dev.properties b/ils-sales-api/config/dev.properties index 9ff78ac..e69de29 100644 --- a/ils-sales-api/config/dev.properties +++ b/ils-sales-api/config/dev.properties @@ -1,58 +0,0 @@ -#rdb -jdbc.driver=net.sf.log4jdbc.DriverSpy -master.jdbc.url=jdbc:log4jdbc:mysql://119.57.140.26:8095/sales?useUnicode=true&characterEncoding=utf8 -master.jdbc.user=sales -master.jdbc.password=Unlcn@12 -slave.jdbc.url=jdbc:mysql://119.57.140.26:8095/sales?useUnicode=true&characterEncoding=utf8 -slave.jdbc.user=sales -slave.jdbc.password=Unlcn@12 - -#securekey -secure.key=kyleKEY -secure.bank.key=kyleKEY - -#redis -#spring.redis.sentinel.master=mymaster -#spring.redis.sentinel.nodes=10.20.30.131:26379 -#spring.redis.password=unlcn -#spring.redis.hostname=10.20.30.131 -#spring.redis.port=6379 -spring.redis.sentinel.master=mymaster1 -spring.redis.sentinel.nodes=119.57.140.26:26380 - - -#qiniu -qiniuDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuBucket=huiyunche-test -qiniuHtmlAddress=http://qiniu.test.huiyunche.cn -qiniulogoDownloadAddress=http://qiniu.logo.huiyunche.cn -qiniulogoBucket=brand-logo -qiniulogoHtmlAddress=https//qiniu.logo.huiyunche.cn -qiniuSendbydriverDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuSendbydriverBucket=huiyunche-test -qiniuSendbydriverHtmlAddress=http://qiniu.test.huiyunche.cn -qiniuBankLogoDownloadAddress=http://qiniu.bank-logo.huiyunche.cn -qiniuBankLogoBucket=bank-logo -qiniuBankLogoHtmlAddress=https//qiniu.bank-logo.huiyunche.cn -qiniuAccessKey=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP -qiniuSecretKey=JzR8sAaj8pE76OraXxwDsEpz0ee1sp2B8LNcG5r2 -qiniuInvalidationTime=7200 - -#jpush -jpush.appKey.driver=6f4106828ac68a3bb79d7324 -jpush.masterSecret.driver=7d0f0982b7d46d7e1b945336 -#无关配置，待清理 -jpush.appKey.stan=6744a08a21a26bbfdb81e2c3 -jpush.masterSecret.stan=e4bbc9f806872cf9204e3093 -jpush.appKey.stancity=054e047550c08171f27508c3 -jpush.masterSecret.stancity=13f9f906abc0f7b65bc46c4e -jpush.appKey.kyle=6f4106828ac68a3bb79d7324 -jpush.masterSecret.kyle=7d0f0982b7d46d7e1b945336 - -#quartz -quartz.isClustered=true - -#SC主数据地址 -ils.sc.url=http://ils.unlcn.com/sc-api -#SC主数据地址请求超时 -ils.sc.url.timeout=7200 \ No newline at end of file diff --git a/ils-sales-api/config/production.properties b/ils-sales-api/config/production.properties index 1d26403..e69de29 100644 --- a/ils-sales-api/config/production.properties +++ b/ils-sales-api/config/production.properties @@ -1,56 +0,0 @@ - -#rdb -jdbc.driver=net.sf.log4jdbc.DriverSpy -master.jdbc.url=jdbc:log4jdbc:mysql://10.20.30.131:3306/ils_sales?useUnicode=true&characterEncoding=utf8 -master.jdbc.user=unlcnils -master.jdbc.password=Unlcnils2016! -slave.jdbc.url=jdbc:mysql://10.20.30.131:3306/ils_sales?useUnicode=true&characterEncoding=utf8 -slave.jdbc.user=unlcnils -slave.jdbc.password=Unlcnils2016! - -#securekey -secure.key=kyleKEY -secure.bank.key=kyleKEY - -#redis -spring.redis.sentinel.master=mymaster -spring.redis.sentinel.nodes=10.20.30.131:26379 -spring.redis.password=unlcn -spring.redis.hostname=10.20.30.131 -spring.redis.port=6379 - -#qiniu -qiniuDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuBucket=huiyunche-test -qiniuHtmlAddress=http://qiniu.test.huiyunche.cn -qiniulogoDownloadAddress=http://qiniu.logo.huiyunche.cn -qiniulogoBucket=brand-logo -qiniulogoHtmlAddress=https//qiniu.logo.huiyunche.cn -qiniuSendbydriverDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuSendbydriverBucket=huiyunche-test -qiniuSendbydriverHtmlAddress=http://qiniu.test.huiyunche.cn -qiniuBankLogoDownloadAddress=http://qiniu.bank-logo.huiyunche.cn -qiniuBankLogoBucket=bank-logo -qiniuBankLogoHtmlAddress=https//qiniu.bank-logo.huiyunche.cn -qiniuAccessKey=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP -qiniuSecretKey=JzR8sAaj8pE76OraXxwDsEpz0ee1sp2B8LNcG5r2 -qiniuInvalidationTime=7200 - -#jpush -jpush.appKey.driver=6f4106828ac68a3bb79d7324 -jpush.masterSecret.driver=7d0f0982b7d46d7e1b945336 -#无关配置，待清理 -jpush.appKey.stan=6744a08a21a26bbfdb81e2c3 -jpush.masterSecret.stan=e4bbc9f806872cf9204e3093 -jpush.appKey.stancity=054e047550c08171f27508c3 -jpush.masterSecret.stancity=13f9f906abc0f7b65bc46c4e -jpush.appKey.kyle=6f4106828ac68a3bb79d7324 -jpush.masterSecret.kyle=7d0f0982b7d46d7e1b945336 - -#quartz -quartz.isClustered=true - -#SC主数据地址 -ils.sc.url=http://ils.unlcn.com/sc-api -#SC主数据地址请求超时 -ils.sc.url.timeout=7200 \ No newline at end of file diff --git a/ils-sales-api/config/uat.properties b/ils-sales-api/config/uat.properties index ed23bc7..e69de29 100644 --- a/ils-sales-api/config/uat.properties +++ b/ils-sales-api/config/uat.properties @@ -1,53 +0,0 @@ - -#rdb -jdbc.driver=net.sf.log4jdbc.DriverSpy -master.jdbc.url=jdbc:log4jdbc:mysql://10.20.30.131:3306/ils_sales?useUnicode=true&characterEncoding=utf8 -master.jdbc.user=unlcnils -master.jdbc.password=Unlcnils2016! -slave.jdbc.url=jdbc:mysql://10.20.30.131:3306/ils_sales?useUnicode=true&characterEncoding=utf8 -slave.jdbc.user=unlcnils -slave.jdbc.password=Unlcnils2016! - -#securekey -secure.key=kyleKEY -secure.bank.key=kyleKEY - -#redis -spring.redis.sentinel.master=mymaster -spring.redis.sentinel.nodes=10.20.30.131:26379 - -#qiniu -qiniuDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuBucket=huiyunche-test -qiniuHtmlAddress=http://qiniu.test.huiyunche.cn -qiniulogoDownloadAddress=http://qiniu.logo.huiyunche.cn -qiniulogoBucket=brand-logo -qiniulogoHtmlAddress=https//qiniu.logo.huiyunche.cn -qiniuSendbydriverDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuSendbydriverBucket=huiyunche-test -qiniuSendbydriverHtmlAddress=http://qiniu.test.huiyunche.cn -qiniuBankLogoDownloadAddress=http://qiniu.bank-logo.huiyunche.cn -qiniuBankLogoBucket=bank-logo -qiniuBankLogoHtmlAddress=https//qiniu.bank-logo.huiyunche.cn -qiniuAccessKey=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP -qiniuSecretKey=JzR8sAaj8pE76OraXxwDsEpz0ee1sp2B8LNcG5r2 -qiniuInvalidationTime=7200 - -#jpush -jpush.appKey.driver=6f4106828ac68a3bb79d7324 -jpush.masterSecret.driver=7d0f0982b7d46d7e1b945336 -#无关配置，待清理 -jpush.appKey.stan=6744a08a21a26bbfdb81e2c3 -jpush.masterSecret.stan=e4bbc9f806872cf9204e3093 -jpush.appKey.stancity=054e047550c08171f27508c3 -jpush.masterSecret.stancity=13f9f906abc0f7b65bc46c4e -jpush.appKey.kyle=6f4106828ac68a3bb79d7324 -jpush.masterSecret.kyle=7d0f0982b7d46d7e1b945336 - -#quartz -quartz.isClustered=true - -#SC主数据地址 -ils.sc.url=http://ils.unlcn.com/sc-api -#SC主数据地址请求超时 -ils.sc.url.timeout=7200 \ No newline at end of file diff --git a/ils-sales-api/src/main/resources/constant.properties b/ils-sales-api/src/main/resources/constant.properties index 9ff78ac..e69de29 100644 --- a/ils-sales-api/src/main/resources/constant.properties +++ b/ils-sales-api/src/main/resources/constant.properties @@ -1,58 +0,0 @@ -#rdb -jdbc.driver=net.sf.log4jdbc.DriverSpy -master.jdbc.url=jdbc:log4jdbc:mysql://119.57.140.26:8095/sales?useUnicode=true&characterEncoding=utf8 -master.jdbc.user=sales -master.jdbc.password=Unlcn@12 -slave.jdbc.url=jdbc:mysql://119.57.140.26:8095/sales?useUnicode=true&characterEncoding=utf8 -slave.jdbc.user=sales -slave.jdbc.password=Unlcn@12 - -#securekey -secure.key=kyleKEY -secure.bank.key=kyleKEY - -#redis -#spring.redis.sentinel.master=mymaster -#spring.redis.sentinel.nodes=10.20.30.131:26379 -#spring.redis.password=unlcn -#spring.redis.hostname=10.20.30.131 -#spring.redis.port=6379 -spring.redis.sentinel.master=mymaster1 -spring.redis.sentinel.nodes=119.57.140.26:26380 - - -#qiniu -qiniuDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuBucket=huiyunche-test -qiniuHtmlAddress=http://qiniu.test.huiyunche.cn -qiniulogoDownloadAddress=http://qiniu.logo.huiyunche.cn -qiniulogoBucket=brand-logo -qiniulogoHtmlAddress=https//qiniu.logo.huiyunche.cn -qiniuSendbydriverDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuSendbydriverBucket=huiyunche-test -qiniuSendbydriverHtmlAddress=http://qiniu.test.huiyunche.cn -qiniuBankLogoDownloadAddress=http://qiniu.bank-logo.huiyunche.cn -qiniuBankLogoBucket=bank-logo -qiniuBankLogoHtmlAddress=https//qiniu.bank-logo.huiyunche.cn -qiniuAccessKey=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP -qiniuSecretKey=JzR8sAaj8pE76OraXxwDsEpz0ee1sp2B8LNcG5r2 -qiniuInvalidationTime=7200 - -#jpush -jpush.appKey.driver=6f4106828ac68a3bb79d7324 -jpush.masterSecret.driver=7d0f0982b7d46d7e1b945336 -#无关配置，待清理 -jpush.appKey.stan=6744a08a21a26bbfdb81e2c3 -jpush.masterSecret.stan=e4bbc9f806872cf9204e3093 -jpush.appKey.stancity=054e047550c08171f27508c3 -jpush.masterSecret.stancity=13f9f906abc0f7b65bc46c4e -jpush.appKey.kyle=6f4106828ac68a3bb79d7324 -jpush.masterSecret.kyle=7d0f0982b7d46d7e1b945336 - -#quartz -quartz.isClustered=true - -#SC主数据地址 -ils.sc.url=http://ils.unlcn.com/sc-api -#SC主数据地址请求超时 -ils.sc.url.timeout=7200 \ No newline at end of file diff --git a/ils-sales-api/src/main/webapp/META-INF/autoconf/auto-config.xml b/ils-sales-api/src/main/webapp/META-INF/autoconf/auto-config.xml index b4f79a4..e89dff3 100644 --- a/ils-sales-api/src/main/webapp/META-INF/autoconf/auto-config.xml +++ b/ils-sales-api/src/main/webapp/META-INF/autoconf/auto-config.xml @@ -1,13 +1,6 @@ - - - - - - - \ No newline at end of file diff --git a/ils-sales-api/src/main/webapp/META-INF/autoconf/config.vm b/ils-sales-api/src/main/webapp/META-INF/autoconf/config.vm index 86d0c91..8b13789 100644 --- a/ils-sales-api/src/main/webapp/META-INF/autoconf/config.vm +++ b/ils-sales-api/src/main/webapp/META-INF/autoconf/config.vm @@ -1,7 +1 @@ -##securekey -secure.key=${secure.key} -#SC主数据地址 -ils.sc.url=${ils.sc.url} -#SC主数据地址请求超时 -ils.sc.url.timeout=${ils.sc.url.timeout} diff --git a/ils-sales-backend/config/dev.properties b/ils-sales-backend/config/dev.properties index 17a9e18..6711a93 100644 --- a/ils-sales-backend/config/dev.properties +++ b/ils-sales-backend/config/dev.properties @@ -57,12 +57,12 @@ jpush.masterSecret.kyle=7d0f0982b7d46d7e1b945336 quartz.isClustered=true #SC主数据地址 -ils.sc.url=http://ils.unlcn.com/sc-api +ils.sc.url=http://119.57.140.26/ils-sc-api #SC主数据地址请求超时 ils.sc.url.timeout=7200 #kyle商户端地址 -ils.kyle.url=http://kylecorp.huiyunche.cn +ils.kyle.url=http://119.57.140.26/kylebuss #kyle商户端地址请求超时 ils.kyle.url.timeout=7200 diff --git a/ils-sales-web/config/dev.properties b/ils-sales-web/config/dev.properties index f6d1d81..e69de29 100644 --- a/ils-sales-web/config/dev.properties +++ b/ils-sales-web/config/dev.properties @@ -1,66 +0,0 @@ -#rdb -jdbc.driver=net.sf.log4jdbc.DriverSpy -master.jdbc.url=jdbc:log4jdbc:mysql://119.57.140.26:8095/sales?useUnicode=true&characterEncoding=utf8 -master.jdbc.user=sales -master.jdbc.password=Unlcn@12 -slave.jdbc.url=jdbc:mysql://119.57.140.26:8095/sales?useUnicode=true&characterEncoding=utf8 -slave.jdbc.user=sales -slave.jdbc.password=Unlcn@12 - -#securekey -secure.key=kyleKEY -secure.bank.key=kyleKEY - -#redis -#spring.redis.sentinel.master=mymaster -#spring.redis.sentinel.nodes=10.20.30.131:26379 -#spring.redis.password=unlcn -#spring.redis.hostname=10.20.30.131 -#spring.redis.port=6379 -spring.redis.sentinel.master=mymaster1 -spring.redis.sentinel.nodes=119.57.140.26:26380 - - -#qiniu -qiniuDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuBucket=huiyunche-test -qiniuHtmlAddress=http://qiniu.test.huiyunche.cn -qiniulogoDownloadAddress=http://qiniu.logo.huiyunche.cn -qiniulogoBucket=brand-logo -qiniulogoHtmlAddress=https//qiniu.logo.huiyunche.cn -qiniuSendbydriverDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuSendbydriverBucket=huiyunche-test -qiniuSendbydriverHtmlAddress=http://qiniu.test.huiyunche.cn -qiniuBankLogoDownloadAddress=http://qiniu.bank-logo.huiyunche.cn -qiniuBankLogoBucket=bank-logo -qiniuBankLogoHtmlAddress=https//qiniu.bank-logo.huiyunche.cn -qiniuAccessKey=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP -qiniuSecretKey=JzR8sAaj8pE76OraXxwDsEpz0ee1sp2B8LNcG5r2 -qiniuInvalidationTime=7200 - -#jpush -jpush.appKey.driver=6f4106828ac68a3bb79d7324 -jpush.masterSecret.driver=7d0f0982b7d46d7e1b945336 -#无关配置，待清理 -jpush.appKey.stan=6744a08a21a26bbfdb81e2c3 -jpush.masterSecret.stan=e4bbc9f806872cf9204e3093 -jpush.appKey.stancity=054e047550c08171f27508c3 -jpush.masterSecret.stancity=13f9f906abc0f7b65bc46c4e -jpush.appKey.kyle=6f4106828ac68a3bb79d7324 -jpush.masterSecret.kyle=7d0f0982b7d46d7e1b945336 - -#quartz -quartz.isClustered=true - -#SC主数据地址 -ils.sc.url=http://ils.unlcn.com/sc-api -#SC主数据地址请求超时 -ils.sc.url.timeout=7200 - -#kyle商户端地址 -ils.kyle.url=http://kylecorp.huiyunche.cn -#kyle商户端地址请求超时 -ils.kyle.url.timeout=7200 - - - diff --git a/ils-sales-web/config/production.properties b/ils-sales-web/config/production.properties index e8f30bc..8b13789 100644 --- a/ils-sales-web/config/production.properties +++ b/ils-sales-web/config/production.properties @@ -1,63 +1 @@ -#rdb -jdbc.driver=net.sf.log4jdbc.DriverSpy -master.jdbc.url=jdbc:log4jdbc:mysql://10.20.30.131:3306/ils_sales?useUnicode=true&characterEncoding=utf8 -master.jdbc.user=unlcnils -master.jdbc.password=Unlcnils2016! -slave.jdbc.url=jdbc:mysql://10.20.30.131:3306/ils_sales?useUnicode=true&characterEncoding=utf8 -slave.jdbc.user=unlcnils -slave.jdbc.password=Unlcnils2016! - -#securekey -secure.key=kyleKEY -secure.bank.key=kyleKEY - -#redis -spring.redis.sentinel.master=mymaster -spring.redis.sentinel.nodes=10.20.30.131:26379 -spring.redis.password=unlcn -spring.redis.hostname=10.20.30.131 -spring.redis.port=6379 - -#qiniu -qiniuDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuBucket=huiyunche-test -qiniuHtmlAddress=http://qiniu.test.huiyunche.cn -qiniulogoDownloadAddress=http://qiniu.logo.huiyunche.cn -qiniulogoBucket=brand-logo -qiniulogoHtmlAddress=https//qiniu.logo.huiyunche.cn -qiniuSendbydriverDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuSendbydriverBucket=huiyunche-test -qiniuSendbydriverHtmlAddress=http://qiniu.test.huiyunche.cn -qiniuBankLogoDownloadAddress=http://qiniu.bank-logo.huiyunche.cn -qiniuBankLogoBucket=bank-logo -qiniuBankLogoHtmlAddress=https//qiniu.bank-logo.huiyunche.cn -qiniuAccessKey=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP -qiniuSecretKey=JzR8sAaj8pE76OraXxwDsEpz0ee1sp2B8LNcG5r2 -qiniuInvalidationTime=7200 - -#jpush -jpush.appKey.driver=6f4106828ac68a3bb79d7324 -jpush.masterSecret.driver=7d0f0982b7d46d7e1b945336 -#无关配置，待清理 -jpush.appKey.stan=6744a08a21a26bbfdb81e2c3 -jpush.masterSecret.stan=e4bbc9f806872cf9204e3093 -jpush.appKey.stancity=054e047550c08171f27508c3 -jpush.masterSecret.stancity=13f9f906abc0f7b65bc46c4e -jpush.appKey.kyle=6f4106828ac68a3bb79d7324 -jpush.masterSecret.kyle=7d0f0982b7d46d7e1b945336 - -#quartz -quartz.isClustered=true - -#SC主数据地址 -ils.sc.url=http://ils.unlcn.com/sc-api -#SC主数据地址请求超时 -ils.sc.url.timeout=7200 - -#kyle商户端地址 -ils.kyle.url=http://kylebuss.huiyunche.cn -#kyle商户端地址请求超时 -ils.kyle.url.timeout=7200 - - diff --git a/ils-sales-web/config/uat.properties b/ils-sales-web/config/uat.properties index 80bde18..e69de29 100644 --- a/ils-sales-web/config/uat.properties +++ b/ils-sales-web/config/uat.properties @@ -1,60 +0,0 @@ -#rdb -jdbc.driver=net.sf.log4jdbc.DriverSpy -master.jdbc.url=jdbc:log4jdbc:mysql://10.20.30.131:3306/ils_sales?useUnicode=true&characterEncoding=utf8 -master.jdbc.user=unlcnils -master.jdbc.password=Unlcnils2016! -slave.jdbc.url=jdbc:mysql://10.20.30.131:3306/ils_sales?useUnicode=true&characterEncoding=utf8 -slave.jdbc.user=unlcnils -slave.jdbc.password=Unlcnils2016! - -#securekey -secure.key=kyleKEY -secure.bank.key=kyleKEY - -#redis -spring.redis.sentinel.master=mymaster -spring.redis.sentinel.nodes=10.20.30.131:26379 - -#qiniu -qiniuDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuBucket=huiyunche-test -qiniuHtmlAddress=http://qiniu.test.huiyunche.cn -qiniulogoDownloadAddress=http://qiniu.logo.huiyunche.cn -qiniulogoBucket=brand-logo -qiniulogoHtmlAddress=https//qiniu.logo.huiyunche.cn -qiniuSendbydriverDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuSendbydriverBucket=huiyunche-test -qiniuSendbydriverHtmlAddress=http://qiniu.test.huiyunche.cn -qiniuBankLogoDownloadAddress=http://qiniu.bank-logo.huiyunche.cn -qiniuBankLogoBucket=bank-logo -qiniuBankLogoHtmlAddress=https//qiniu.bank-logo.huiyunche.cn -qiniuAccessKey=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP -qiniuSecretKey=JzR8sAaj8pE76OraXxwDsEpz0ee1sp2B8LNcG5r2 -qiniuInvalidationTime=7200 - -#jpush -jpush.appKey.driver=6f4106828ac68a3bb79d7324 -jpush.masterSecret.driver=7d0f0982b7d46d7e1b945336 -#无关配置，待清理 -jpush.appKey.stan=6744a08a21a26bbfdb81e2c3 -jpush.masterSecret.stan=e4bbc9f806872cf9204e3093 -jpush.appKey.stancity=054e047550c08171f27508c3 -jpush.masterSecret.stancity=13f9f906abc0f7b65bc46c4e -jpush.appKey.kyle=6f4106828ac68a3bb79d7324 -jpush.masterSecret.kyle=7d0f0982b7d46d7e1b945336 - -#quartz -quartz.isClustered=true - -#SC主数据地址 -ils.sc.url=http://ils.unlcn.com/sc-api -#SC主数据地址请求超时 -ils.sc.url.timeout=7200 - -#kyle商户端地址 -ils.kyle.url=http://kylecorp.huiyunche.cn -#kyle商户端地址请求超时 -ils.kyle.url.timeout=7200 - - - diff --git a/ils-sales-web/src/main/resources/constant.properties b/ils-sales-web/src/main/resources/constant.properties index cde5e47..e69de29 100644 --- a/ils-sales-web/src/main/resources/constant.properties +++ b/ils-sales-web/src/main/resources/constant.properties @@ -1,66 +0,0 @@ -#rdb -jdbc.driver=net.sf.log4jdbc.DriverSpy -master.jdbc.url=jdbc:log4jdbc:mysql://119.57.140.26:8095/sales?useUnicode=true&characterEncoding=utf8 -master.jdbc.user=sales -master.jdbc.password=Unlcn@12 -slave.jdbc.url=jdbc:mysql://119.57.140.26:8095/sales?useUnicode=true&characterEncoding=utf8 -slave.jdbc.user=sales -slave.jdbc.password=Unlcn@12 - -#securekey -secure.key=kyleKEY -secure.bank.key=kyleKEY - -#redis -#spring.redis.sentinel.master=mymaster -#spring.redis.sentinel.nodes=10.20.30.131:26379 -#spring.redis.password=unlcn -#spring.redis.hostname=10.20.30.131 -#spring.redis.port=6379 -spring.redis.sentinel.master=mymaster1 -spring.redis.sentinel.nodes=119.57.140.26:26380 - - -#qiniu -qiniuDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuBucket=huiyunche-test -qiniuHtmlAddress=http://qiniu.test.huiyunche.cn -qiniulogoDownloadAddress=http://qiniu.logo.huiyunche.cn -qiniulogoBucket=brand-logo -qiniulogoHtmlAddress=https//qiniu.logo.huiyunche.cn -qiniuSendbydriverDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuSendbydriverBucket=huiyunche-test -qiniuSendbydriverHtmlAddress=http://qiniu.test.huiyunche.cn -qiniuBankLogoDownloadAddress=http://qiniu.bank-logo.huiyunche.cn -qiniuBankLogoBucket=bank-logo -qiniuBankLogoHtmlAddress=https//qiniu.bank-logo.huiyunche.cn -qiniuAccessKey=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP -qiniuSecretKey=JzR8sAaj8pE76OraXxwDsEpz0ee1sp2B8LNcG5r2 -qiniuInvalidationTime=7200 - -#jpush -jpush.appKey.driver=6f4106828ac68a3bb79d7324 -jpush.masterSecret.driver=7d0f0982b7d46d7e1b945336 -#无关配置，待清理 -jpush.appKey.stan=6744a08a21a26bbfdb81e2c3 -jpush.masterSecret.stan=e4bbc9f806872cf9204e3093 -jpush.appKey.stancity=054e047550c08171f27508c3 -jpush.masterSecret.stancity=13f9f906abc0f7b65bc46c4e -jpush.appKey.kyle=6f4106828ac68a3bb79d7324 -jpush.masterSecret.kyle=7d0f0982b7d46d7e1b945336 - -#quartz -quartz.isClustered=true - -#SC主数据地址 -ils.sc.url=http://ils.unlcn.com/sc-api -#SC主数据地址请求超时 -ils.sc.url.timeout=7200 - -#kyle商户端地址 -ils.kyle.url=http://kylebuss.huiyunche.cn -#kyle商户端地址请求超时 -ils.kyle.url.timeout=7200 - - - diff --git a/ils-sales-web/src/main/webapp/META-INF/autoconf/auto-config.xml b/ils-sales-web/src/main/webapp/META-INF/autoconf/auto-config.xml index 7aead1b..e89dff3 100644 --- a/ils-sales-web/src/main/webapp/META-INF/autoconf/auto-config.xml +++ b/ils-sales-web/src/main/webapp/META-INF/autoconf/auto-config.xml @@ -1,13 +1,6 @@ - - - - - - - \ No newline at end of file diff --git a/ils-sales-web/src/main/webapp/META-INF/autoconf/config.vm b/ils-sales-web/src/main/webapp/META-INF/autoconf/config.vm index 0ade56a..e69de29 100644 --- a/ils-sales-web/src/main/webapp/META-INF/autoconf/config.vm +++ b/ils-sales-web/src/main/webapp/META-INF/autoconf/config.vm @@ -1,7 +0,0 @@ -##securekey -secure.key=${secure.key} - -#kyle商户端地址 -ils.kyle.url=${ils.kyle.url} -#kyle商户端地址请求超时 -ils.kyle.url.timeout=${ils.kyle.url.timeout} \ No newline at end of file -- Gitee From 712a6b6808a949301c0542aacccbb3c5e993a506 Mon Sep 17 00:00:00 2001 From: zhaoguixin <306743062@qq.com> Date: Thu, 17 Aug 2017 10:55:52 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ils-sales-backend/src/main/resources/constant.properties | 6 +++--- .../src/main/resources/spring/applicationContext-cache.xml | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ils-sales-backend/src/main/resources/constant.properties b/ils-sales-backend/src/main/resources/constant.properties index 46fab44..1c751de 100644 --- a/ils-sales-backend/src/main/resources/constant.properties +++ b/ils-sales-backend/src/main/resources/constant.properties @@ -57,14 +57,14 @@ jpush.masterSecret.kyle=7d0f0982b7d46d7e1b945336 quartz.isClustered=true #SC主数据地址 -ils.sc.url=http://ils.unlcn.com/sc-api +ils.sc.url=http://119.57.140.26/ils-sc-api #SC主数据地址请求超时 ils.sc.url.timeout=7200 #kyle商户端地址 -ils.kyle.url=http://kylebuss.huiyunche.cn +ils.kyle.url=http://119.57.140.26/kylebuss #kyle商户端地址请求超时 -ils.kyle.url.timeout=7200\ +ils.kyle.url.timeout=7200 #BMS端地址 ils.bms.url=http://192.168.199.151:8080/hyc-bms-api/ diff --git a/ils-sales-backend/src/main/resources/spring/applicationContext-cache.xml b/ils-sales-backend/src/main/resources/spring/applicationContext-cache.xml index e962e27..9a51cf9 100644 --- a/ils-sales-backend/src/main/resources/spring/applicationContext-cache.xml +++ b/ils-sales-backend/src/main/resources/spring/applicationContext-cache.xml @@ -11,15 +11,10 @@ -<<<<<<< HEAD - -======= - ->>>>>>> develop Date: Thu, 17 Aug 2017 11:23:50 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=95=B0=E6=8D=AE=E6=96=B9=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/constant/AutoConfConstant.java | 122 ++++++++++++++++++ .../backend/service/OrderAddrServiceImpl.java | 11 +- .../service/OrderAttachServiceImpl.java | 13 +- .../service/OrderAuditServiceImpl.java | 10 +- .../backend/service/OrderServiceImpl.java | 18 +-- .../backend/service/OrderSkuServiceImpl.java | 11 +- .../service/UserBankcardServiceImpl.java | 18 +-- .../backend/service/UserServiceImpl.java | 17 ++- 8 files changed, 173 insertions(+), 47 deletions(-) create mode 100644 ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/constant/AutoConfConstant.java diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/constant/AutoConfConstant.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/constant/AutoConfConstant.java new file mode 100644 index 0000000..6ffe1e4 --- /dev/null +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/constant/AutoConfConstant.java @@ -0,0 +1,122 @@ +package com.unlcn.ils.sales.backend.constant; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * Created by houjianhui on 2017/8/17. + */ +@Configuration +public class AutoConfConstant { + + @Value("${ils.sc.url}") + private String sc; + + @Value("${ils.sc.url.timeout}") + private Integer scTime; + + @Value("${ils.kyle.url}") + private String kyle; + + @Value("${ils.kyle.url.timeout}") + private Integer kyleTime; + + @Value("${ils.bms.url}") + private String bms; + + @Value("${ils.bms.url.timeout}") + private Integer bmsTime; + + @Value("${ils.sale.brands}") + private Integer brands; + + @Value("${secure.key}") + private String secure; + + @Value("${qiniuBankLogoBucket}") + private String BankLogo; + + + @Value("${secure.bank.key}") + private String bankSecureKey; + + public String getSc() { + return sc; + } + + public void setSc(String sc) { + this.sc = sc; + } + + public Integer getScTime() { + return scTime; + } + + public void setScTime(Integer scTime) { + this.scTime = scTime; + } + + public String getKyle() { + return kyle; + } + + public void setKyle(String kyle) { + this.kyle = kyle; + } + + public Integer getKyleTime() { + return kyleTime; + } + + public void setKyleTime(Integer kyleTime) { + this.kyleTime = kyleTime; + } + + public String getBms() { + return bms; + } + + public void setBms(String bms) { + this.bms = bms; + } + + public Integer getBmsTime() { + return bmsTime; + } + + public void setBmsTime(Integer bmsTime) { + this.bmsTime = bmsTime; + } + + public Integer getBrands() { + return brands; + } + + public void setBrands(Integer brands) { + this.brands = brands; + } + + public String getSecure() { + return secure; + } + + public void setSecure(String secure) { + this.secure = secure; + } + + public String getBankLogo() { + return BankLogo; + } + + public void setBankLogo(String bankLogo) { + BankLogo = bankLogo; + } + + public String getBankSecureKey() { + return bankSecureKey; + } + + public void setBankSecureKey(String bankSecureKey) { + this.bankSecureKey = bankSecureKey; + } +} diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAddrServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAddrServiceImpl.java index c48e301..e1f03e0 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAddrServiceImpl.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAddrServiceImpl.java @@ -2,11 +2,11 @@ package com.unlcn.ils.sales.backend.service; import cn.huiyunche.commons.exception.BusinessException; import cn.huiyunche.commons.utils.HttpRequestUtil; -import cn.huiyunche.commons.utils.PropertiesUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.unlcn.ils.sales.backend.bo.AreaBO; import com.unlcn.ils.sales.backend.bo.OrderBO; +import com.unlcn.ils.sales.backend.constant.AutoConfConstant; import com.unlcn.ils.sales.base.mapper.SaleOrderAddrMapper; import com.unlcn.ils.sales.base.model.SaleOrderAddr; import org.slf4j.Logger; @@ -17,7 +17,6 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.Objects; -import java.util.Properties; /** * Created by houjianhui on 2017/5/27. @@ -30,6 +29,9 @@ public class OrderAddrServiceImpl implements OrderAddrService { @Autowired private SaleOrderAddrMapper orderAddrMapper; + @Autowired + private AutoConfConstant autoConfConstant; + private static final String startArea = "startArea", endArea = "endArea", province = "province"; @Override @@ -74,9 +76,8 @@ public class OrderAddrServiceImpl implements OrderAddrService { } private List resolvAreaFormSCResult(String key, Integer startAreaId, Integer endProvinceId, String tag) throws Exception { - Properties property = PropertiesUtil.loadFromFile("classpath://constant.properties"); - String url = PropertiesUtil.getString(property, "ils.sc.url", ""); - Integer time = PropertiesUtil.getInt(property, "ils.sc.url.timeout", 7200); + String url = autoConfConstant.getSc(); + Integer time = autoConfConstant.getScTime(); if (startArea.equals(tag)) { url = url + "/api/network/lnlines/queryStartArea/" + key; } else if (province.equals(tag)) { diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAttachServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAttachServiceImpl.java index 045f2bd..7116fdf 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAttachServiceImpl.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAttachServiceImpl.java @@ -5,6 +5,7 @@ import cn.huiyunche.commons.utils.HttpRequestUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.unlcn.ils.sales.backend.bo.UserViewBO; +import com.unlcn.ils.sales.backend.constant.AutoConfConstant; import com.unlcn.ils.sales.backend.enums.AttachAuditStatusEnum; import com.unlcn.ils.sales.base.mapper.SaleOrderAttachMapper; import com.unlcn.ils.sales.base.model.SaleOrderAttach; @@ -14,7 +15,6 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.HashMap; @@ -30,18 +30,15 @@ public class OrderAttachServiceImpl implements OrderAttachService{ private static final Logger LOGGER = LoggerFactory.getLogger(OrderAttachServiceImpl.class); - @Value("${ils.bms.url}") - private String url; - - @Value("${ils.bms.url.timeout}") - private Integer timeOut; - @Autowired private SaleOrderAttachMapper saleOrderAttachMapper; @Autowired private OrderService orderService; + @Autowired + private AutoConfConstant autoConfConstant; + @Autowired private UserService userService; @@ -87,7 +84,7 @@ public class OrderAttachServiceImpl implements OrderAttachService{ map.put("salesOrderCode", salesOrderCode); map.put("picKey", picKey); map.put("createUser", createUser); - String result = HttpRequestUtil.sendHttpPost(url + "api/audit/submit", map, timeOut); + String result = HttpRequestUtil.sendHttpPost(autoConfConstant.getBms() + "api/audit/submit", map, autoConfConstant.getBmsTime()); if (!Objects.equals(result, null)) { JSONObject jsonObject = JSONObject.parseObject(result); String msgCode = jsonObject.getString("messageCode"); diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java index 7ac9a7d..cf1a582 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java @@ -2,12 +2,12 @@ package com.unlcn.ils.sales.backend.service; import cn.huiyunche.commons.exception.BusinessException; import cn.huiyunche.commons.utils.HttpRequestUtil; -import cn.huiyunche.commons.utils.PropertiesUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.unlcn.ils.sales.backend.bo.OrderAuditBO; import com.unlcn.ils.sales.backend.bo.OrderToKyleBO; import com.unlcn.ils.sales.backend.bo.PriceBO; +import com.unlcn.ils.sales.backend.constant.AutoConfConstant; import com.unlcn.ils.sales.backend.enums.OrderAuditStatusEnum; import com.unlcn.ils.sales.base.mapper.SaleOrderAuditMapper; import com.unlcn.ils.sales.base.mapper.SaleOrderViewMapper; @@ -34,6 +34,9 @@ public class OrderAuditServiceImpl implements OrderAuditService { @Autowired private SaleOrderAuditMapper orderAuditMapper; + @Autowired + private AutoConfConstant autoConfConstant; + @Autowired private SaleOrderViewMapper orderViewMapper; @@ -173,9 +176,8 @@ public class OrderAuditServiceImpl implements OrderAuditService { * @throws Exception */ private void pushSaleOrderToKyle(Map map) throws Exception { - Properties property = PropertiesUtil.loadFromFile("classpath://constant.properties"); - String url = PropertiesUtil.getString(property, "ils.kyle.url", "") + "/saleOrder/syncSaleOrder"; - Integer time = PropertiesUtil.getInt(property, "ils.kyle.url.timeout", 7200); + String url = autoConfConstant.getKyle() + "/saleOrder/syncSaleOrder"; + Integer time = autoConfConstant.getKyleTime(); String result = HttpRequestUtil.sendHttpPost(url, map, time); if (!Objects.equals(result, null)) { JSONObject jsonObject = JSONObject.parseObject(result); diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java index 437e317..b5c6b37 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java @@ -3,12 +3,12 @@ package com.unlcn.ils.sales.backend.service; import cn.huiyunche.commons.domain.PageVo; import cn.huiyunche.commons.exception.BusinessException; import cn.huiyunche.commons.utils.HttpRequestUtil; -import cn.huiyunche.commons.utils.PropertiesUtil; import cn.huiyunche.commons.utils.QiniuUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import com.unlcn.ils.sales.backend.bo.*; +import com.unlcn.ils.sales.backend.constant.AutoConfConstant; import com.unlcn.ils.sales.backend.enums.AttachAuditStatusEnum; import com.unlcn.ils.sales.backend.enums.OrderStatusEnum; import com.unlcn.ils.sales.backend.util.UniquenessUtil; @@ -56,6 +56,9 @@ public class OrderServiceImpl implements OrderService { @Autowired private UserService userService; + @Autowired + private AutoConfConstant autoConfConstant; + @Override public int save(OrderBO bo, BindingResult br) throws Exception { LOGGER.info("OrderServiceImpl.save params OrderBO: {}", bo); @@ -371,8 +374,7 @@ public class OrderServiceImpl implements OrderService { BigDecimal dis = BigDecimal.valueOf(0); List fees = new ArrayList<>(); // 获取整板数量 - Properties property = PropertiesUtil.loadFromFile("classpath://constant.properties"); - Integer brands = PropertiesUtil.getInt(property, "ils.sale.brands", 10); + Integer brands = autoConfConstant.getBrands(); if (CollectionUtils.isNotEmpty(prices)) { PriceBO priceBO = prices.get(0); BeanUtils.copyProperties(priceBO, bo); @@ -455,9 +457,8 @@ public class OrderServiceImpl implements OrderService { * @throws Exception */ private List resolvPriceFormSCResult(Integer departRegionId, Integer destRegionId) throws Exception { - Properties property = PropertiesUtil.loadFromFile("classpath://constant.properties"); - String url = PropertiesUtil.getString(property, "ils.sc.url", "") + "/api/price/channel/sale/queryPrice/" + departRegionId + "/" + destRegionId; - Integer time = PropertiesUtil.getInt(property, "ils.sc.url.timeout", 7200); + String url = autoConfConstant.getSc() + "/api/price/channel/sale/queryPrice/" + departRegionId + "/" + destRegionId; + Integer time = autoConfConstant.getScTime(); String result = HttpRequestUtil.sendHttpGet(url, null, time); if (!Objects.equals(result, null)) { JSONObject jsonObject = JSONObject.parseObject(result); @@ -482,9 +483,8 @@ public class OrderServiceImpl implements OrderService { * @throws Exception */ private List getOrderStatusFormKyleResult(String orderCode) throws Exception { - Properties property = PropertiesUtil.loadFromFile("classpath://constant.properties"); - String url = PropertiesUtil.getString(property, "ils.kyle.url", "") + "/saleOrder/getOrderStatus"; - Integer time = PropertiesUtil.getInt(property, "ils.kyle.url.timeout", 7200); + String url = autoConfConstant.getKyle() + "/saleOrder/getOrderStatus"; + Integer time = autoConfConstant.getKyleTime(); Map map = new HashMap<>(); map.put("orderCode", orderCode); String result = HttpRequestUtil.sendHttpPost(url, map, time); diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java index 0ae0a43..2070d07 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java @@ -2,12 +2,12 @@ package com.unlcn.ils.sales.backend.service; import cn.huiyunche.commons.exception.BusinessException; import cn.huiyunche.commons.utils.HttpRequestUtil; -import cn.huiyunche.commons.utils.PropertiesUtil; import cn.huiyunche.commons.utils.QiniuUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.unlcn.ils.sales.backend.bo.BrandBO; import com.unlcn.ils.sales.backend.bo.OrderSkuBO; +import com.unlcn.ils.sales.backend.constant.AutoConfConstant; import com.unlcn.ils.sales.base.mapper.SaleOrderSkuMapper; import com.unlcn.ils.sales.base.model.SaleOrderSku; import org.apache.commons.collections4.CollectionUtils; @@ -20,7 +20,6 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.Objects; -import java.util.Properties; /** * Created by houjianhui on 2017/5/27. @@ -32,6 +31,9 @@ public class OrderSkuServiceImpl implements OrderSkuService { @Autowired private SaleOrderSkuMapper orderSkuMapper; + @Autowired + private AutoConfConstant autoConfConstant; + @Override public Integer save(String bo, Integer saleOrderId) throws Exception { LOGGER.info("OrderSkuServiceImpl.save params OrderSkuBO: {}", bo); @@ -84,9 +86,8 @@ public class OrderSkuServiceImpl implements OrderSkuService { } private List resolvBrandFormSCResult(String key) throws Exception { - Properties property = PropertiesUtil.loadFromFile("classpath://constant.properties"); - String url = PropertiesUtil.getString(property, "ils.sc.url", "") + "/api/model/base/cv/queryModel/" + key; - Integer time = PropertiesUtil.getInt(property, "ils.sc.url.timeout", 7200); + String url = autoConfConstant.getSc() + "/api/model/base/cv/queryModel/" + key; + Integer time = autoConfConstant.getScTime(); String result = HttpRequestUtil.sendHttpGet(url, null, time); if (!Objects.equals(result, null)) { JSONObject jsonObject = JSONObject.parseObject(result); diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/UserBankcardServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/UserBankcardServiceImpl.java index 0a800a6..b732b97 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/UserBankcardServiceImpl.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/UserBankcardServiceImpl.java @@ -1,13 +1,13 @@ package com.unlcn.ils.sales.backend.service; import cn.huiyunche.commons.exception.BusinessException; -import cn.huiyunche.commons.utils.PropertiesUtil; import cn.huiyunche.commons.utils.QiniuUtil; import com.google.common.collect.Lists; import com.unlcn.ils.sales.backend.bo.BankBO; import com.unlcn.ils.sales.backend.bo.UserBankCardViewBO; import com.unlcn.ils.sales.backend.bo.UserBankcardBO; import com.unlcn.ils.sales.backend.bo.UserViewBO; +import com.unlcn.ils.sales.backend.constant.AutoConfConstant; import com.unlcn.ils.sales.backend.enums.YeepayCardTypeEnum; import com.unlcn.ils.sales.backend.enums.YeepayCardValidEnum; import com.unlcn.ils.sales.backend.util.Encodes; @@ -48,6 +48,9 @@ public class UserBankcardServiceImpl implements UserBankcardService { @Autowired private UserService userService; + @Autowired + private AutoConfConstant autoConfConstant; + @Override public Integer save(UserBankcardBO bo) throws Exception { LOGGER.info("UserBankcardServiceImpl.save param UserBankcardBO: {}", bo); @@ -107,8 +110,7 @@ public class UserBankcardServiceImpl implements UserBankcardService { bankBO = new BankBO(); } String code = decryptBankCard(val.getCode()); - Properties property = PropertiesUtil.loadFromFile("classpath://constant.properties"); - String bankLogoBucket = PropertiesUtil.getString(property, "qiniuBankLogoBucket", ""); + String bankLogoBucket = autoConfConstant.getBankLogo(); String codeKey = BANK_CARD_PREFIX + code.substring(code.length() - 4, code.length()); bos.add(new UserBankCardViewBO(val.getId(), codeKey , bankBO.getName(), QiniuUtil.generateDownloadURL(bankLogoBucket, bankBO.getLogo(), "", "", ""), QiniuUtil.generateDownloadURL(bankLogoBucket, bankBO.getLogoSecond(), "", "", ""), QiniuUtil.generateDownloadURL(bankLogoBucket, bankBO.getBackgroundLogo(), "", "", ""), @@ -142,9 +144,8 @@ public class UserBankcardServiceImpl implements UserBankcardService { * @param cardCode 银行卡号 * @return 加密之后卡号 */ - public static String encryptBankCard(String cardCode) { - Properties property = PropertiesUtil.loadFromFile("classpath://constant.properties"); - String key = PropertiesUtil.getString(property, "bankSecureKey", ""); + public String encryptBankCard(String cardCode) { + String key = autoConfConstant.getBankSecureKey(); return Encodes.encryptAES(cardCode, key); } @@ -154,9 +155,8 @@ public class UserBankcardServiceImpl implements UserBankcardService { * @param cardCode 银行卡号 * @return 解密之后卡号 */ - public static String decryptBankCard(String cardCode) { - Properties property = PropertiesUtil.loadFromFile("classpath://constant.properties"); - String key = PropertiesUtil.getString(property, "bankSecureKey", ""); + public String decryptBankCard(String cardCode) { + String key = autoConfConstant.getBankSecureKey(); if (StringUtils.isNotBlank(cardCode)) { return Encodes.decryptAES(cardCode, key); } diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/UserServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/UserServiceImpl.java index b0c27d3..809f578 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/UserServiceImpl.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/UserServiceImpl.java @@ -2,11 +2,11 @@ package com.unlcn.ils.sales.backend.service; import cn.huiyunche.commons.constant.QiniuConstant; import cn.huiyunche.commons.exception.BusinessException; -import cn.huiyunche.commons.utils.PropertiesUtil; import cn.huiyunche.commons.utils.QiniuUtil; import com.google.common.collect.Lists; import com.unlcn.ils.sales.backend.bo.UserBO; import com.unlcn.ils.sales.backend.bo.UserViewBO; +import com.unlcn.ils.sales.backend.constant.AutoConfConstant; import com.unlcn.ils.sales.backend.redis.MindsJedisConnectionFactory; import com.unlcn.ils.sales.backend.security.JwtAuthenicationFilter; import com.unlcn.ils.sales.backend.security.JwtUtils; @@ -28,7 +28,10 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; import redis.clients.jedis.Jedis; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; /** * Created by houjianhui on 2017/6/9. @@ -53,6 +56,9 @@ public class UserServiceImpl implements UserService { @Autowired private SaleUserViewMapper userViewMapper; + @Autowired + private AutoConfConstant autoConfConstant; + @Override public Map login(String loginName, String pwd) throws Exception { LOGGER.info("UserServiceImpl.login prams loginName: {}, pwd: {}", loginName, pwd); @@ -71,9 +77,7 @@ public class UserServiceImpl implements UserService { LOGGER.info("current user is null"); throw new BusinessException("登录失败"); } - Properties property = PropertiesUtil.loadFromFile("classpath://constant.properties"); - String key = PropertiesUtil.getString(property, "secure.key", ""); - //System.out.println(passwordEncoder.encodePassword(pwd, key)); + String key = autoConfConstant.getSecure(); if (!passwordEncoder.isPasswordValid(userBO.getPwd(), pwd, key)) { LOGGER.info("UserServiceImpl.login pwd is error"); throw new BusinessException("用户名或密码错误"); @@ -205,8 +209,7 @@ public class UserServiceImpl implements UserService { LOGGER.info("UserServiceImpl.restPwd current user doesn't exist"); throw new BusinessException("当前用户不存在"); } - Properties property = PropertiesUtil.loadFromFile("classpath://constant.properties"); - String key = PropertiesUtil.getString(property, "secure.key", ""); + String key = autoConfConstant.getSecure(); bo.setPwd(passwordEncoder.encodePassword(pwd, key)); SaleUser user = new SaleUser(); BeanUtils.copyProperties(bo, user); -- Gitee From 55e7284d77f9bc6ab24a97878d7bdc87bd728e05 Mon Sep 17 00:00:00 2001 From: zhaoguixin <306743062@qq.com> Date: Thu, 17 Aug 2017 15:31:02 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ils-sales-backend/config/dev.properties | 5 +++++ ils-sales-backend/config/production.properties | 5 +++++ ils-sales-backend/config/uat.properties | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/ils-sales-backend/config/dev.properties b/ils-sales-backend/config/dev.properties index 6711a93..159e0f9 100644 --- a/ils-sales-backend/config/dev.properties +++ b/ils-sales-backend/config/dev.properties @@ -66,5 +66,10 @@ ils.kyle.url=http://119.57.140.26/kylebuss #kyle商户端地址请求超时 ils.kyle.url.timeout=7200 +#BMS端地址 +ils.bms.url=http://119.57.140.26/hyc-bms-api +#kyle商户端地址请求超时 +ils.bms.url.timeout=7200 + #整板数量配置 ils.sale.brands=10 diff --git a/ils-sales-backend/config/production.properties b/ils-sales-backend/config/production.properties index c56be8b..f9f86e1 100644 --- a/ils-sales-backend/config/production.properties +++ b/ils-sales-backend/config/production.properties @@ -66,5 +66,10 @@ ils.kyle.url=http://kylebuss.huiyunche.cn #kyle商户端地址请求超时 ils.kyle.url.timeout=7200 +#BMS端地址 +ils.bms.url=http://119.57.140.26/hyc-bms-api +#kyle商户端地址请求超时 +ils.bms.url.timeout=7200 + #整板数量配置 ils.sale.brands=10 diff --git a/ils-sales-backend/config/uat.properties b/ils-sales-backend/config/uat.properties index 1899184..154aa5a 100644 --- a/ils-sales-backend/config/uat.properties +++ b/ils-sales-backend/config/uat.properties @@ -60,5 +60,10 @@ ils.kyle.url=http://kylecorp.huiyunche.cn #kyle商户端地址请求超时 ils.kyle.url.timeout=7200 +#BMS端地址 +ils.bms.url=http://119.57.140.26/hyc-bms-api +#kyle商户端地址请求超时 +ils.bms.url.timeout=7200 + #整板数量配置 ils.sale.brands=10 -- Gitee From 6ea63e5ad8700d483ad64c3d353ee58e5ca3ff3b Mon Sep 17 00:00:00 2001 From: zhaoguixin <306743062@qq.com> Date: Thu, 17 Aug 2017 16:42:35 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/unlcn/ils/sales/api/dto/OrderDTO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderDTO.java b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderDTO.java index f0eba1f..906108b 100644 --- a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderDTO.java +++ b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderDTO.java @@ -46,6 +46,8 @@ public class OrderDTO { @ApiModelProperty(value = "订单附件审核显示状态") private String attachAuditStatusText; + + public Integer getId() { return id; } -- Gitee From 85320cc90d1520aeacfc62fd292ab203af8d46d2 Mon Sep 17 00:00:00 2001 From: zhaoguixin <306743062@qq.com> Date: Thu, 17 Aug 2017 16:45:09 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E5=88=A0=E9=99=A4api=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/constant.properties | 66 ------------------- 1 file changed, 66 deletions(-) diff --git a/ils-sales-api/src/main/resources/constant.properties b/ils-sales-api/src/main/resources/constant.properties index ba15ec7..e69de29 100644 --- a/ils-sales-api/src/main/resources/constant.properties +++ b/ils-sales-api/src/main/resources/constant.properties @@ -1,66 +0,0 @@ -<<<<<<< HEAD -#rdb -jdbc.driver=net.sf.log4jdbc.DriverSpy -master.jdbc.url=jdbc:log4jdbc:mysql://119.57.140.26:8095/sales?useUnicode=true&characterEncoding=utf8 -master.jdbc.user=kyle -master.jdbc.password=ED`v3Ky3|RS.d6| -slave.jdbc.url=jdbc:mysql://119.57.140.26:8095/sales?useUnicode=true&characterEncoding=utf8 -slave.jdbc.user=kyle -slave.jdbc.password=ED`v3Ky3|RS.d6| - -#securekey -secure.key=kyleKEY -secure.bank.key=kyleKEY - -#redis -#spring.redis.sentinel.master=mymaster -#spring.redis.sentinel.nodes=10.20.30.131:26379 -#spring.redis.password=unlcn -#spring.redis.hostname=10.20.30.131 -#spring.redis.port=6379 -spring.redis.sentinel.master=mymaster1 -spring.redis.sentinel.nodes=119.57.140.26:26380 - - -#qiniu -qiniuDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuBucket=huiyunche-test -qiniuHtmlAddress=http://qiniu.test.huiyunche.cn -qiniulogoDownloadAddress=http://qiniu.logo.huiyunche.cn -qiniulogoBucket=brand-logo -qiniulogoHtmlAddress=https//qiniu.logo.huiyunche.cn -qiniuSendbydriverDownloadAddress=http://qiniu.test.huiyunche.cn -qiniuSendbydriverBucket=huiyunche-test -qiniuSendbydriverHtmlAddress=http://qiniu.test.huiyunche.cn -qiniuBankLogoDownloadAddress=http://qiniu.bank-logo.huiyunche.cn -qiniuBankLogoBucket=bank-logo -qiniuBankLogoHtmlAddress=https//qiniu.bank-logo.huiyunche.cn -qiniuAccessKey=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP -qiniuSecretKey=JzR8sAaj8pE76OraXxwDsEpz0ee1sp2B8LNcG5r2 -qiniuInvalidationTime=7200 - -#jpush -jpush.appKey.driver=6f4106828ac68a3bb79d7324 -jpush.masterSecret.driver=7d0f0982b7d46d7e1b945336 -#无关配置，待清理 -jpush.appKey.stan=6744a08a21a26bbfdb81e2c3 -jpush.masterSecret.stan=e4bbc9f806872cf9204e3093 -jpush.appKey.stancity=054e047550c08171f27508c3 -jpush.masterSecret.stancity=13f9f906abc0f7b65bc46c4e -jpush.appKey.kyle=6f4106828ac68a3bb79d7324 -jpush.masterSecret.kyle=7d0f0982b7d46d7e1b945336 - -#quartz -quartz.isClustered=true - -#SC主数据地址 -ils.sc.url=http://ils.unlcn.com/sc-api -#SC主数据地址请求超时 -ils.sc.url.timeout=7200 - -#BMS端地址 -ils.bms.url=http://192.168.199.151:8080/hyc-bms-api/ -#kyle商户端地址请求超时 -ils.bms.url.timeout=7200 -======= ->>>>>>> develop -- Gitee From a1161c4421f0bc31edab26fe15365f65f7e3f1ae Mon Sep 17 00:00:00 2001 From: zhaoguixin <306743062@qq.com> Date: Thu, 17 Aug 2017 16:46:59 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E5=88=A0=E9=99=A4API=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/webapp/META-INF/autoconf/auto-config.xml | 14 -------------- .../src/main/webapp/META-INF/autoconf/config.vm | 13 ------------- 2 files changed, 27 deletions(-) diff --git a/ils-sales-api/src/main/webapp/META-INF/autoconf/auto-config.xml b/ils-sales-api/src/main/webapp/META-INF/autoconf/auto-config.xml index c4d2838..e89dff3 100644 --- a/ils-sales-api/src/main/webapp/META-INF/autoconf/auto-config.xml +++ b/ils-sales-api/src/main/webapp/META-INF/autoconf/auto-config.xml @@ -1,19 +1,5 @@ -<<<<<<< HEAD - - - - - - - - - - - -======= ->>>>>>> develop diff --git a/ils-sales-api/src/main/webapp/META-INF/autoconf/config.vm b/ils-sales-api/src/main/webapp/META-INF/autoconf/config.vm index 354b5cb..e69de29 100644 --- a/ils-sales-api/src/main/webapp/META-INF/autoconf/config.vm +++ b/ils-sales-api/src/main/webapp/META-INF/autoconf/config.vm @@ -1,13 +0,0 @@ - -<<<<<<< HEAD -#SC主数据地址 -ils.sc.url=${ils.sc.url} -#SC主数据地址请求超时 -ils.sc.url.timeout=${ils.sc.url.timeout} - -#bms地址 -ils.bms.url=${ils.bms.url} -#bms地址请求超时 -ils.bms.url.timeout=${ils.bms.url.timeout} -======= ->>>>>>> develop -- Gitee From ff9d95542a9806e55d32b46c49adca12c6d25ab1 Mon Sep 17 00:00:00 2001 From: houjianhui Date: Thu, 17 Aug 2017 17:10:10 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/constant.properties | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ils-sales-api/src/main/resources/constant.properties b/ils-sales-api/src/main/resources/constant.properties index e69de29..59ee56a 100644 --- a/ils-sales-api/src/main/resources/constant.properties +++ b/ils-sales-api/src/main/resources/constant.properties @@ -0,0 +1,15 @@ +qiniuDownloadAddress=http://qiniu.test.huiyunche.cn +qiniuBucket=huiyunche-test +qiniuHtmlAddress=http://qiniu.test.huiyunche.cn +qiniulogoDownloadAddress=http://qiniu.logo.huiyunche.cn +qiniulogoBucket=brand-logo +qiniulogoHtmlAddress=https//qiniu.logo.huiyunche.cn +qiniuSendbydriverDownloadAddress=http://qiniu.test.huiyunche.cn +qiniuSendbydriverBucket=huiyunche-test +qiniuSendbydriverHtmlAddress=http://qiniu.test.huiyunche.cn +qiniuBankLogoDownloadAddress=http://qiniu.bank-logo.huiyunche.cn +qiniuBankLogoBucket=bank-logo +qiniuBankLogoHtmlAddress=https//qiniu.bank-logo.huiyunche.cn +qiniuAccessKey=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP +qiniuSecretKey=JzR8sAaj8pE76OraXxwDsEpz0ee1sp2B8LNcG5r2 +qiniuInvalidationTime=7200 \ No newline at end of file -- Gitee From c403461cb256e7683767602ae83590969240eb11 Mon Sep 17 00:00:00 2001 From: zhaoguixin <306743062@qq.com> Date: Thu, 17 Aug 2017 17:13:13 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E5=9B=A0=E5=9F=BA=E7=A1=80=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB=E8=8E=B7=E5=8F=96=E4=B8=83=E7=89=9B=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=97=AE=E9=A2=98=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9C=A8?= =?UTF-8?q?api=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=B8=83=E7=89=9B=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ils-sales-api/config/dev.properties | 15 +++++++++++++++ ils-sales-api/config/production.properties | 15 +++++++++++++++ ils-sales-api/config/uat.properties | 15 +++++++++++++++ .../webapp/META-INF/autoconf/auto-config.xml | 17 +++++++++++++++++ .../src/main/webapp/META-INF/autoconf/config.vm | 16 ++++++++++++++++ 5 files changed, 78 insertions(+) diff --git a/ils-sales-api/config/dev.properties b/ils-sales-api/config/dev.properties index e69de29..59ee56a 100644 --- a/ils-sales-api/config/dev.properties +++ b/ils-sales-api/config/dev.properties @@ -0,0 +1,15 @@ +qiniuDownloadAddress=http://qiniu.test.huiyunche.cn +qiniuBucket=huiyunche-test +qiniuHtmlAddress=http://qiniu.test.huiyunche.cn +qiniulogoDownloadAddress=http://qiniu.logo.huiyunche.cn +qiniulogoBucket=brand-logo +qiniulogoHtmlAddress=https//qiniu.logo.huiyunche.cn +qiniuSendbydriverDownloadAddress=http://qiniu.test.huiyunche.cn +qiniuSendbydriverBucket=huiyunche-test +qiniuSendbydriverHtmlAddress=http://qiniu.test.huiyunche.cn +qiniuBankLogoDownloadAddress=http://qiniu.bank-logo.huiyunche.cn +qiniuBankLogoBucket=bank-logo +qiniuBankLogoHtmlAddress=https//qiniu.bank-logo.huiyunche.cn +qiniuAccessKey=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP +qiniuSecretKey=JzR8sAaj8pE76OraXxwDsEpz0ee1sp2B8LNcG5r2 +qiniuInvalidationTime=7200 \ No newline at end of file diff --git a/ils-sales-api/config/production.properties b/ils-sales-api/config/production.properties index e69de29..59ee56a 100644 --- a/ils-sales-api/config/production.properties +++ b/ils-sales-api/config/production.properties @@ -0,0 +1,15 @@ +qiniuDownloadAddress=http://qiniu.test.huiyunche.cn +qiniuBucket=huiyunche-test +qiniuHtmlAddress=http://qiniu.test.huiyunche.cn +qiniulogoDownloadAddress=http://qiniu.logo.huiyunche.cn +qiniulogoBucket=brand-logo +qiniulogoHtmlAddress=https//qiniu.logo.huiyunche.cn +qiniuSendbydriverDownloadAddress=http://qiniu.test.huiyunche.cn +qiniuSendbydriverBucket=huiyunche-test +qiniuSendbydriverHtmlAddress=http://qiniu.test.huiyunche.cn +qiniuBankLogoDownloadAddress=http://qiniu.bank-logo.huiyunche.cn +qiniuBankLogoBucket=bank-logo +qiniuBankLogoHtmlAddress=https//qiniu.bank-logo.huiyunche.cn +qiniuAccessKey=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP +qiniuSecretKey=JzR8sAaj8pE76OraXxwDsEpz0ee1sp2B8LNcG5r2 +qiniuInvalidationTime=7200 \ No newline at end of file diff --git a/ils-sales-api/config/uat.properties b/ils-sales-api/config/uat.properties index e69de29..59ee56a 100644 --- a/ils-sales-api/config/uat.properties +++ b/ils-sales-api/config/uat.properties @@ -0,0 +1,15 @@ +qiniuDownloadAddress=http://qiniu.test.huiyunche.cn +qiniuBucket=huiyunche-test +qiniuHtmlAddress=http://qiniu.test.huiyunche.cn +qiniulogoDownloadAddress=http://qiniu.logo.huiyunche.cn +qiniulogoBucket=brand-logo +qiniulogoHtmlAddress=https//qiniu.logo.huiyunche.cn +qiniuSendbydriverDownloadAddress=http://qiniu.test.huiyunche.cn +qiniuSendbydriverBucket=huiyunche-test +qiniuSendbydriverHtmlAddress=http://qiniu.test.huiyunche.cn +qiniuBankLogoDownloadAddress=http://qiniu.bank-logo.huiyunche.cn +qiniuBankLogoBucket=bank-logo +qiniuBankLogoHtmlAddress=https//qiniu.bank-logo.huiyunche.cn +qiniuAccessKey=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP +qiniuSecretKey=JzR8sAaj8pE76OraXxwDsEpz0ee1sp2B8LNcG5r2 +qiniuInvalidationTime=7200 \ No newline at end of file diff --git a/ils-sales-api/src/main/webapp/META-INF/autoconf/auto-config.xml b/ils-sales-api/src/main/webapp/META-INF/autoconf/auto-config.xml index e89dff3..9f6c8c9 100644 --- a/ils-sales-api/src/main/webapp/META-INF/autoconf/auto-config.xml +++ b/ils-sales-api/src/main/webapp/META-INF/autoconf/auto-config.xml @@ -1,5 +1,22 @@ + + + + + + + + + + + + + + + + + diff --git a/ils-sales-api/src/main/webapp/META-INF/autoconf/config.vm b/ils-sales-api/src/main/webapp/META-INF/autoconf/config.vm index e69de29..fdace65 100644 --- a/ils-sales-api/src/main/webapp/META-INF/autoconf/config.vm +++ b/ils-sales-api/src/main/webapp/META-INF/autoconf/config.vm @@ -0,0 +1,16 @@ +##qiniu +qiniuDownloadAddress=${qiniuDownloadAddress} +qiniuHtmlAddress=${qiniuHtmlAddress} +qiniulogoDownloadAddress=${qiniulogoDownloadAddress} +qiniulogoHtmlAddress=${qiniulogoHtmlAddress} +qiniuBankLogoDownloadAddress=${qiniuBankLogoDownloadAddress} +qiniuBankLogoHtmlAddress=${qiniuBankLogoHtmlAddress} +qiniuSendbydriverDownloadAddress=${qiniuSendbydriverDownloadAddress} +qiniuSendbydriverHtmlAddress=${qiniuSendbydriverHtmlAddress} +qiniuAccessKey=wQknukoe-lwcjLKEnsBz-BrL61M1BEMP0Gq_M2qP +qiniuSecretKey=JzR8sAaj8pE76OraXxwDsEpz0ee1sp2B8LNcG5r2 +qiniuInvalidationTime=7200 +qiniuBucket=${qiniuBucket} +qiniulogoBucket=${qiniulogoBucket} +qiniuBankLogoBucket=${qiniuBankLogoBucket} +qiniuSendbydriverBucket=${qiniuSendbydriverBucket} \ No newline at end of file -- Gitee From 9ed51ea4d8a49cd813c7133e1f59aa73a15a0387 Mon Sep 17 00:00:00 2001 From: zhaoguixin <306743062@qq.com> Date: Fri, 18 Aug 2017 18:03:24 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E8=B0=83=E7=94=A8bms=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ils-sales-backend/config/production.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ils-sales-backend/config/production.properties b/ils-sales-backend/config/production.properties index f9f86e1..6d9344f 100644 --- a/ils-sales-backend/config/production.properties +++ b/ils-sales-backend/config/production.properties @@ -67,7 +67,7 @@ ils.kyle.url=http://kylebuss.huiyunche.cn ils.kyle.url.timeout=7200 #BMS端地址 -ils.bms.url=http://119.57.140.26/hyc-bms-api +ils.bms.url=http://bms.huiyunche.cn #kyle商户端地址请求超时 ils.bms.url.timeout=7200 -- Gitee