本地订单提交

src/main/java/com/qtzl/alterSales/manager/service/AflProductInfoServiceImpl.java

 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.hutool.core.bean.BeanUtil;
+import com.google.common.collect.Lists;
+import com.qtzl.alterSales.dao.entity.second.AflProductHisInfo;
 import com.qtzl.alterSales.dao.entity.second.AflProductInfo;
+import com.qtzl.alterSales.dao.entity.second.AflSignChannelsProduct;
+import com.qtzl.alterSales.dao.repo.jpa.second.AflProductHisInfoRepo;
 import com.qtzl.alterSales.dao.repo.jpa.second.AflProductInfoRepo;
-import com.qtzl.alterSales.dao.repo.jpa.second.AflSignChannelsInfoRepo;
+import com.qtzl.alterSales.dao.repo.jpa.second.AflSignChannelsProductRepo;
+import com.qtzl.alterSales.manager.enums.AuditStatusEnum;
+import com.qtzl.alterSales.manager.enums.GroundStatusEnum;
+import com.qtzl.alterSales.manager.enums.IsDeleteEnum;
 import com.qtzl.alterSales.manager.model.protocol.UcServiceError;
 import com.qtzl.alterSales.manager.model.protocol.sales.*;
 import com.qtzl.alterSales.manager.service.third.ConstantConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.springframework.beans.BeanUtils;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.persistence.criteria.Predicate;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 @Service
 public class AflProductInfoServiceImpl implements AflProductInfoService{
     @Resource
     AflProductInfoRepo aflProductInfoRepo;
     @Resource
-    AflSignChannelsInfoRepo aflSignChannelsInfoRepo;
+    AflSignChannelsProductRepo aflSignChannelsProductRepo;
+    @Resource
+    AflProductHisInfoRepo aflProductHisInfoRepo;
 
     @Resource
     FmsService fmsService;
     ConstantConfig constantConfig;
 
     @Override
-    public void save(AflSignChannelsInfoSaveOrUpdateRequest request) throws ServiceHandleException {
-//        if (StringUtils.isEmpty(request.getChannelCode())) {
-//            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("渠道编码不能为空");
-//        }
-//        if (!StringUtils.isEmpty(request.getId())) {
-//            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("该方法为新增,渠道编号不可以指定");
-//        }
-//        AflSignChannelsInfo aflSignChannelsInfo= aflProductInfoRepo.findByChannelCode(request.getChannelCode());
-//        if (aflSignChannelsInfo!=null){
-//            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("已存在该渠道编码配置，不允许重复，请核实");
-//        }
-//        aflSignChannelsInfo=new AflSignChannelsInfo();
-//        BeanUtils.copyProperties(request,aflSignChannelsInfo);
-//        aflSignChannelsInfo.setIsDelete(0);//默认未删除
-//        aflSignChannelsInfo.setStatus(0);//默认正常
-//        aflSignChannelsInfo.setInsertTime(new Date());
-//        aflProductInfoRepo.save(aflSignChannelsInfo);
+    public void save(AflProductInfoSaveOrUpdateRequest request) throws ServiceHandleException {
+        verify(request);
+        if (StringUtils.isEmpty(request.getCreator())){
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("创建人不能为空");
+        }
+        if (!StringUtils.isEmpty(request.getId())) {
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("该方法为新增,产品编号不可以指定");
+        }
+        AflProductInfo aflProductInfo  = aflProductInfoRepo.findByProductCode(request.getProductCode());
+        if (aflProductInfo!=null){
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("已存在该产品编码的配置,不允许重复");
+        }
+        aflProductInfo = new AflProductInfo();
+        BeanUtils.copyProperties(request,aflProductInfo);
+        aflProductInfo.setIsDelete(IsDeleteEnum.NO.getCode());//默认未删除
+        aflProductInfo.setAuditStatus(AuditStatusEnum.PENDINGREVIEW.getCode());
+        aflProductInfo.setInsertTime(new Date());
+        aflProductInfoRepo.save(aflProductInfo);
     }
 
     @Override
-    public void update(AflSignChannelsInfoSaveOrUpdateRequest request) throws ServiceHandleException {
-//        AflSignChannelsInfo aflSignChannelsInfo= null;
-//        try {
-//            aflSignChannelsInfo = findById(request.getId());
-//        } catch (ServiceHandleException e) {
-//            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException(e.getMessage());
-//        }
-//        if (!aflSignChannelsInfo.getChannelCode().equals(request.getChannelCode())){
-//            AflSignChannelsInfo aflSignChannelsVo= aflProductInfoRepo.findByChannelCode(request.getChannelCode());
-//            if (aflSignChannelsVo!=null){
-//                throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("已存在该渠道编码配置，不允许重复，请核实");
-//            }
-//        }
-//        getAflSignChannelsInfo(request,aflSignChannelsInfo);
-//        aflSignChannelsInfo.setUpdatedTime(new Date());
-//        aflProductInfoRepo.save(aflSignChannelsInfo);
+    public void update(AflProductInfoSaveOrUpdateRequest request) throws ServiceHandleException {
+        verify(request);
+        if (StringUtils.isEmpty(request.getUpdator())){
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("修改人不能为空");
+        }
+        AflProductInfo aflProductInfo = findById(request.getId());
+        if (!aflProductInfo.getProductCode().equals(request.getProductCode())){
+            AflProductInfo byProductCode  = aflProductInfoRepo.findByProductCode(request.getProductCode());
+            if (byProductCode!=null){
+                throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("已存在该产品编码的配置,不允许重复");
+            }
+        }
+        if (aflProductInfo.getGroundStatus()==null||aflProductInfo.getGroundStatus()== GroundStatusEnum.GROUND.getCode()){
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("只能修改未上架或已下架产品");
+        }
+        //保存历史
+        saveHis(aflProductInfo);
+        //修改信息进入审核
+        request.setCreator(aflProductInfo.getCreator());
+        BeanUtils.copyProperties(request,aflProductInfo);
+        aflProductInfo.setAuditStatus(AuditStatusEnum.PENDINGREVIEW.getCode());
+        aflProductInfo.setUpdateTime(new Date());
+        aflProductInfoRepo.save(aflProductInfo);
     }
 
     @Override
-    public AflProductInfoFindByIdVo findById(String id) throws ServiceHandleException {
+    public AflProductInfo findById(String id) throws ServiceHandleException {
         if (StringUtils.isEmpty(id)) {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("请指定产品配置编号");
         }
-        AflProductInfoFindByIdVo aflProductInfoFindByIdVo = aflProductInfoRepo.findByIdAndIsDelete(id);
-        if (null == aflProductInfoFindByIdVo) {
+        AflProductInfo aflProductInfo=  aflProductInfoRepo.findByIdAndIsDelete(id);
+        if (null == aflProductInfo) {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("产品配置不存在");
         }
-        return aflProductInfoFindByIdVo;
+        return aflProductInfo;
     }
 
     @Override
         if (StringUtils.isEmpty(request.getId())){
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("请指定产品配置编号");
         }
-        AflProductInfoFindByIdVo aflProductInfoFindByIdVo = findById(request.getId());
-        AflProductInfo aflProductInfo = new AflProductInfo();
-        BeanUtils.copyProperties(aflProductInfoFindByIdVo,aflProductInfo);
-        aflProductInfo.setIsDelete(1);//删除
+        AflProductInfo aflProductInfo = findById(request.getId());
+        aflProductInfo.setIsDelete(IsDeleteEnum.YES.getCode());//删除
         aflProductInfoRepo.save(aflProductInfo);
     }
 
             if (request.getTemplate()){
                 pathFile = ExcelUtils.export(response, "产品信息模板", constantConfig.getFilePath(), null, AflProductInfoImportVo.class);
             }else {
-                AflProductInfoExportHqlRequest queryRequest = new AflProductInfoExportHqlRequest();
-                BeanUtil.copyProperties(request, queryRequest);
-                List<AflProductInfoFindByIdVo> aflProductInfoFindByIdVoList = aflProductInfoRepo.list(queryRequest);
-
-                if (aflProductInfoFindByIdVoList == null || aflProductInfoFindByIdVoList.size() == 0) {
+//                AflProductInfoExportHqlRequest queryRequest = new AflProductInfoExportHqlRequest();
+//                BeanUtil.copyProperties(request, queryRequest);
+//                List<AflProductInfoFindByIdVo> aflProductInfoFindByIdVoList = aflProductInfoRepo.list(queryRequest);
+//
+//                if (aflProductInfoFindByIdVoList == null || aflProductInfoFindByIdVoList.size() == 0) {
+//                    pathFile = ExcelUtils.export(response, "产品信息", constantConfig.getFilePath(), null, AflProductInfoFindByIdVo.class);
+//                } else {
+//                    pathFile = ExcelUtils.export(response, "产品信息", constantConfig.getFilePath(), aflProductInfoFindByIdVoList, AflProductInfoFindByIdVo.class);
+//
+//                }
+                List<AflProductInfo> select = select(request);
+                if (select == null || select.size() == 0) {
                     pathFile = ExcelUtils.export(response, "产品信息", constantConfig.getFilePath(), null, AflProductInfoFindByIdVo.class);
                 } else {
-                    logger.info("选装-产品信息管理导出返回参数：{}", aflProductInfoFindByIdVoList.toString());
-                    pathFile = ExcelUtils.export(response, "产品信息", constantConfig.getFilePath(), aflProductInfoFindByIdVoList, AflProductInfoFindByIdVo.class);
+                    List<AflProductInfoFindByIdVo> aflProductInfoFindByIdVos = new ArrayList<>();
+                    for (AflProductInfo aflProductInfo : select) {
+                        AflProductInfoFindByIdVo aflProductInfoFindByIdVo = new AflProductInfoFindByIdVo();
+                        BeanUtils.copyProperties(aflProductInfo,aflProductInfoFindByIdVo);
+                        aflProductInfoFindByIdVos.add(aflProductInfoFindByIdVo);
+                    }
+                    pathFile = ExcelUtils.export(response, "产品信息", constantConfig.getFilePath(), aflProductInfoFindByIdVos, AflProductInfoFindByIdVo.class);
 
                 }
             }
     @Override
     public void updateStatus(AflProductInfoUpdateGroundStatusRequest request) throws ServiceHandleException {
 
-        AflProductInfoFindByIdVo aflProductInfoFindByIdVo = findById(request.getId());
-        if (aflProductInfoFindByIdVo.getGroundStatus()==request.getGroundStatus()) {
+        if (StringUtils.isEmpty(request.getUpdator())){
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("修改人不能为空");
+        }
+        AflProductInfo aflProductInfo = findById(request.getId());
+        if (aflProductInfo.getGroundStatus()==request.getGroundStatus()) {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("上架状态没有发生改变");
         }
-        AflProductInfo aflProductInfo = new AflProductInfo();
-        BeanUtils.copyProperties(aflProductInfoFindByIdVo,aflProductInfo);
+        //保存历史
+        saveHis(aflProductInfo);
+        //
         aflProductInfo.setGroundStatus(request.getGroundStatus());
+        aflProductInfo.setGroundTime(new Date());
+        aflProductInfo.setUpdator(request.getUpdator());
         aflProductInfoRepo.save(aflProductInfo);
     }
 
         if (StringUtils.isEmpty(request.getId())){
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("请指定产品配置编号");
         }
+        if (StringUtils.isEmpty(request.getAuditor())){
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("审核人不能为空");
+        }
         //审核失败，审核原因必填
         if (request.getAuditStatus()==2){
             if (StringUtils.isEmpty(request.getReason())){
                 throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("审核失败，请填入审核原因");
             }
         }
-        AflProductInfoFindByIdVo aflProductInfoFindByIdVo = findById(request.getId());
-        if (aflProductInfoFindByIdVo.getAuditStatus()==request.getAuditStatus()){
+        AflProductInfo aflProductInfo = findById(request.getId());
+        if (aflProductInfo.getAuditStatus()==request.getAuditStatus()){
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("产品审核状态未发生改变");
         }
 
-        AflProductInfo aflProductInfo = new AflProductInfo();
-        BeanUtils.copyProperties(aflProductInfoFindByIdVo,aflProductInfo);
+        //保存历史
+        saveHis(aflProductInfo);
+
         BeanUtils.copyProperties(request,aflProductInfo);
+        aflProductInfo.setGroundStatus(GroundStatusEnum.NOTGROUND.getCode());
         aflProductInfoRepo.save(aflProductInfo);
     }
 
                 throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("导入失败，没有数据");
             }
             for (AflProductInfoImportVo aflProductInfoImportVo : aflProductInfoImportVos) {
-                if (StringUtils.isEmpty(aflProductInfoImportVo.getChannelName())){
-                    throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("导入失败，渠道不能为空");
-                }
-                String channelCode= aflSignChannelsInfoRepo.findByChannelName(aflProductInfoImportVo.getChannelName());
-                if (StringUtils.isEmpty(channelCode)){
-                    throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("导入失败，未查询到渠道信息");
+                AflProductInfo byProductCode  = aflProductInfoRepo.findByProductCode(aflProductInfoImportVo.getProductCode());
+                if (byProductCode!=null){
+                    throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("已存在该产品编码的配置,不允许重复");
                 }
                 AflProductInfo aflProductInfo = new AflProductInfo();
                 BeanUtil.copyProperties(aflProductInfoImportVo,aflProductInfo);
-                aflProductInfo.setChannelCode(channelCode);
+                aflProductInfo.setIsDelete(IsDeleteEnum.NO.getCode());//默认未删除
+                aflProductInfo.setAuditStatus(AuditStatusEnum.PENDINGREVIEW.getCode());
                 aflProductInfo.setInsertTime(new Date());
-                aflProductInfo.setAuditStatus(0);
-                aflProductInfo.setGroundStatus(0);
-                aflProductInfo.setIsDelete(0);
                 aflProductInfoRepo.save(aflProductInfo);
             }
         } catch (Exception e) {
             }
         }
     }
+
+    @Override
+    public void addSignChannels(AflSignChannelsProductSaveRequest request) throws ServiceHandleException {
+        if (StringUtils.isEmpty(request.getProductId())) {
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("产品id不能为空");
+        }
+        if (StringUtils.isEmpty(request.getChannelCode())) {
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("签约渠道编码不能为空");
+        }
+        AflSignChannelsProduct aflSignChannelsProduct = new AflSignChannelsProduct();
+        BeanUtils.copyProperties(request,aflSignChannelsProduct);
+        aflSignChannelsProduct.setIsDelete(IsDeleteEnum.NO.getCode());//默认未删除
+        aflSignChannelsProductRepo.save(aflSignChannelsProduct);
+    }
+
+    private void verify(AflProductInfoSaveOrUpdateRequest request) throws ServiceHandleException {
+
+        if (StringUtils.isEmpty(request.getProductCode())) {
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("产品编码不能为空");
+        }
+        if (StringUtils.isEmpty(request.getProductName())) {
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("产品名称不能为空");
+        }
+        if (StringUtils.isEmpty(request.getProductIcon())) {
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("产品图标不能为空");
+        }
+        if (request.getProductEffectiveTime()==null) {
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("产品有效期不能为空");
+        }
+        if (StringUtils.isEmpty(request.getProductDescribe())) {
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("产品描述不能为空");
+        }
+    }
+    private void saveHis(AflProductInfo aflProductInfo ){
+        AflProductHisInfo aflProductHisInfo = new AflProductHisInfo();
+        BeanUtils.copyProperties(aflProductInfo,aflProductHisInfo);
+        aflProductHisInfo.setId(UUID.randomUUID().toString().replace("-", ""));
+        aflProductHisInfo.setHisId(aflProductInfo.getId());
+        aflProductHisInfoRepo.save(aflProductHisInfo);
+    }
+
+    private List<AflProductInfo> select(AflProductInfoExportRequest request) throws ServiceHandleException {
+
+        return aflProductInfoRepo.findAll(((root, query, cb) -> {
+            List<Predicate> list = Lists.newArrayList();
+            if (!StringUtils.isEmpty(request.getProductCode())) {
+                list.add(cb.equal(root.<String>get("productCode"), request.getProductCode()));
+            }
+            if (!StringUtils.isEmpty(request.getProductName())) {
+                list.add(cb.equal(root.get("productName"), request.getProductName()));
+            }
+            if (request.getAuditStatus()!=null) {
+                list.add(cb.equal(root.<Integer>get("auditStatus"), request.getAuditStatus()));
+            }
+            if (request.getGroundStatus()!=null) {
+                list.add(cb.equal(root.<Integer>get("groundStatus"), request.getGroundStatus()));
+            }
+            if (request.getGroundTimeEnd()!=null) {
+                list.add(cb.lessThanOrEqualTo(root.<Date>get("groundTime"), request.getGroundTimeEnd()));
+            }
+            if (request.getGroundTimeStart()!=null) {
+                list.add(cb.greaterThanOrEqualTo(root.<Date>get("groundTime"), request.getGroundTimeStart()));
+            }
+            if (request.getUndercarriageTimeEnd()!=null) {
+                list.add(cb.lessThanOrEqualTo(root.<Date>get("undercarriageTime"), request.getUndercarriageTimeEnd()));
+            }
+            if (request.getUndercarriageTimeStart()!=null) {
+                list.add(cb.greaterThanOrEqualTo(root.<Date>get("undercarriageTime"), request.getUndercarriageTimeStart()));
+            }
+            if (request.getInsertTimeEnd()!=null) {
+                list.add(cb.lessThanOrEqualTo(root.<Date>get("insertTime"), request.getInsertTimeEnd()));
+            }
+            if (request.getInsertTimeStart()!=null) {
+                list.add(cb.greaterThanOrEqualTo(root.<Date>get("insertTime"), request.getInsertTimeStart()));
+            }
+            //查询为未删除的数据
+            list.add(cb.equal(root.<Integer>get("isDelete"), IsDeleteEnum.NO.getCode()));
+            Predicate[] p = new Predicate[list.size()];
+            return cb.and(list.toArray(p));
+        }), Sort.by(Sort.Direction.DESC, "insertTime"));
+    }
 }

src/main/java/com/qtzl/alterSales/manager/service/AfterSalesCmd.java

     UPDATESTATUSSIGNCHANNELSINFO("修改状态-签约渠道信息修改状态接口", UcServiceType.AFTERSALES),
     FINDSIGNCHANNELSINFO("查询-签约渠道信息查询已签约渠道接口", UcServiceType.AFTERSALES),
     FINDPAGEPRODUCTINFO("查询-产品管理分页查询接口", UcServiceType.AFTERSALES),
+    ADDORUPDATEPRODUCTINFO("新增或修改-产品管理新增或修改接口", UcServiceType.AFTERSALES),
     DELETEPRODUCTINFO("删除-产品管理删除接口", UcServiceType.AFTERSALES),
     UPDATEGROUNDSTATUSPRODUCTINFO("修改-产品管理修改上架状态接口", UcServiceType.AFTERSALES),
     FINDBYIDPRODUCTINFO("查询-产品管理查询详情接口", UcServiceType.AFTERSALES),
     EXPORTPRODUCTINFO("导出-产品信息导出接口", UcServiceType.AFTERSALES),
     AUDITPRODUCTINFO("审核-产品信息审核接口", UcServiceType.AFTERSALES),
     IMPORTPRODUCTINFO("导入-产品信息导入接口", UcServiceType.AFTERSALES),
+    ADDSIGNCHANNELSPRODUCTINFO("新增-产品渠道信息新增接口", UcServiceType.AFTERSALES),
     FINDPAGEACCESSCHANNELINFO("查询-接入渠道管理分页查询接口", UcServiceType.AFTERSALES),
     ADDORUPDATEACCESSCHANNELINFO("新增或修改-接入渠道管理新增或修改接口", UcServiceType.AFTERSALES),
     FINDBYIDACCESSCHANNELINFO("查询-接入渠道管理查询接口", UcServiceType.AFTERSALES),