huanglizhi před 1 rokem
rodič
revize
3d32b9da76
23 změnil soubory, kde provedl 315 přidání a 17 odebrání
  1. 8 0
      module-erp/src/main/java/com/hys/app/controller/erp/goods/SpecificationManagerController.java
  2. 10 0
      module-erp/src/main/java/com/hys/app/controller/erp/use/KdnController.java
  3. 14 0
      module-erp/src/main/java/com/hys/app/controller/erp/use/OrderController.java
  4. 18 2
      module-erp/src/main/java/com/hys/app/controller/erp/use/PayController.java
  5. 29 0
      module-erp/src/main/java/com/hys/app/controller/erp/use/task/OrderReturnTask.java
  6. 16 0
      module-erp/src/main/java/com/hys/app/mapper/erp/OrderCustomerFeeMapper.java
  7. 1 0
      module-erp/src/main/java/com/hys/app/mapper/erp/OrderReturnMapper.java
  8. 3 0
      module-erp/src/main/java/com/hys/app/mapper/goods/SpecificationMapper.java
  9. 49 0
      module-erp/src/main/java/com/hys/app/model/erp/dos/OrderCustomerFee.java
  10. 3 2
      module-erp/src/main/java/com/hys/app/model/erp/dto/ProductDTO.java
  11. 3 0
      module-erp/src/main/java/com/hys/app/model/erp/vo/OrderVO.java
  12. 1 1
      module-erp/src/main/java/com/hys/app/pay/ali/AliPayService.java
  13. 26 0
      module-erp/src/main/java/com/hys/app/service/erp/OrderCustomerFeeManager.java
  14. 17 0
      module-erp/src/main/java/com/hys/app/service/erp/OrderManager.java
  15. 1 3
      module-erp/src/main/java/com/hys/app/service/erp/impl/GoodsManagerImpl.java
  16. 50 0
      module-erp/src/main/java/com/hys/app/service/erp/impl/OrderCustomerFeeManagerImpl.java
  17. 17 1
      module-erp/src/main/java/com/hys/app/service/erp/impl/OrderManagerImpl.java
  18. 2 0
      module-erp/src/main/java/com/hys/app/service/goods/SpecificationManager.java
  19. 14 0
      module-erp/src/main/java/com/hys/app/service/goods/impl/SpecificationManagerImpl.java
  20. 8 0
      module-erp/src/main/java/com/hys/app/service/kuaidiniao/KuaiDiNiaoService.java
  21. 18 4
      module-erp/src/main/java/com/hys/app/service/kuaidiniao/KuaiDiNiaoServiceImpl.java
  22. 3 0
      module-erp/src/main/resources/mapper/goods/SpecificationMapper.xml
  23. 4 4
      server/src/main/resources/application.yml

+ 8 - 0
module-erp/src/main/java/com/hys/app/controller/erp/goods/SpecificationManagerController.java

@@ -116,6 +116,14 @@ public class SpecificationManagerController {
 		return specification;
 	}
 
+	@ApiOperation(value = "查询平台自定义的所有规格项", notes = "根据分类id查询规格")
+	@GetMapping("/getAllCategories")
+	public List<SpecificationVO> getAllCategories() {
+		return specificationManager.getAllCategories();
+	}
+
+
+
 	@ApiOperation(value = "平台自定义某规格的规格值")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "spec_id", value = "规格id", required = true, paramType = "path", dataType = "int"),

+ 10 - 0
module-erp/src/main/java/com/hys/app/controller/erp/use/KdnController.java

@@ -40,6 +40,16 @@ public class KdnController {
         return kuaiDiNiaoService.kdnReturnBack(returnBackBase);
     }
 
+    @ApiOperation(value = "快递鸟发货获取单号")
+    @PostMapping("/prePareTime/{orderId}")
+    @Log(client = LogClient.admin, detail = "订单[${orderId}]发货")
+    public String prePareTime(@PathVariable(value = "orderId") Long orderId
+            , @RequestBody @Valid PreOrderModelDTO preOrderModel
+            , @RequestBody AddressDTO addressDTO) {
+        return kuaiDiNiaoService.prePareTime(preOrderModel, orderId, addressDTO);
+    }
+
+
     @ApiOperation(value = "快递鸟发货获取单号")
     @PostMapping("/kdShip/{orderId}")
     @Log(client = LogClient.admin, detail = "订单[${orderId}]发货")

+ 14 - 0
module-erp/src/main/java/com/hys/app/controller/erp/use/OrderController.java

@@ -6,6 +6,7 @@ import com.hys.app.framework.context.user.AdminUserContext;
 import com.hys.app.framework.database.BaseQueryParam;
 import com.hys.app.framework.database.WebPage;
 import com.hys.app.framework.security.model.Admin;
+import com.hys.app.model.erp.dos.OrderCustomerFee;
 import com.hys.app.model.erp.dos.OrderSendDO;
 import com.hys.app.model.erp.dto.OrderDTO;
 import com.hys.app.model.erp.dto.OrderQueryParams;
@@ -137,5 +138,18 @@ public class OrderController {
         orderManager.extension(orderId,orderDTO);
     }
 
+    @ApiOperation(value = "添加费用报销")
+    @PostMapping("addOrderCustomerFee")
+    @Log(client = LogClient.admin, detail = "创建订单")
+    public Long add(@RequestBody @Valid OrderCustomerFee orderCustomerFee) {
+        return orderManager.addOrderCustomerFee(orderCustomerFee);
+    }
+
+    @ApiOperation(value = "修改费用报销")
+    @PostMapping("/editOrderCustomerFee/{id}")
+    @Log(client = LogClient.admin, detail = "修改id为[${id}]的费用报销单")
+    public void edit(@PathVariable Long id, @RequestBody @Valid OrderCustomerFee orderCustomerFee) {
+        orderManager.editOrderCustomerFee(id,orderCustomerFee);
+    }
 }
 

+ 18 - 2
module-erp/src/main/java/com/hys/app/controller/erp/use/PayController.java

@@ -1,12 +1,16 @@
 package com.hys.app.controller.erp.use;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.hys.app.framework.exception.ServiceException;
+import com.hys.app.model.erp.dos.OrderCustomerFee;
 import com.hys.app.model.erp.dos.OrderDO;
 import com.hys.app.model.erp.dto.PayTypeUrl;
 import com.hys.app.pay.ali.AliPayService;
 import com.hys.app.pay.ali.PayOrder;
 import com.hys.app.pay.ali.WxService;
+import com.hys.app.service.erp.OrderCustomerFeeManager;
 import com.hys.app.service.erp.OrderManager;
 import com.wechat.pay.java.core.auth.WechatPay2Validator;
 import io.swagger.annotations.Api;
@@ -20,7 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -32,6 +38,7 @@ public class PayController {
     private OrderManager orderManager;
     private AliPayService aliPayService;
     private WxService wxService;
+    private OrderCustomerFeeManager orderCustomerFeeManager;
 
     @ApiOperation(value = "扫描完获取拉起支付的url")
     @PostMapping("/getPayUrl")
@@ -40,17 +47,26 @@ public class PayController {
         if (ObjectUtil.isNull(aDo)) {
             throw new ServiceException("未查询到订单信息");
         }
+
+
+
         PayOrder payOrder = new PayOrder();
         payOrder.setTraceNo(aDo.getId().toString());
-        payOrder.setTotalAmount(aDo.getRealPrice());
+
         payOrder.setSubject("租赁订单支付金额");
         payOrder.setTimeExpire(LocalDateTime.now().plusMinutes(30));
+        List<OrderCustomerFee> list = orderCustomerFeeManager.list(new LambdaQueryWrapper<OrderCustomerFee>().eq(OrderCustomerFee::getOrderId, payTypeUrl.getOrderId()));
+        if (CollectionUtil.isNotEmpty(list)){
+            payOrder.setTotalAmount(new BigDecimal(aDo.getRealPrice()).add(list.stream().map(OrderCustomerFee::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add)).doubleValue());
+        }else {
+            payOrder.setTotalAmount(aDo.getRealPrice());
+        }
 
         switch (payTypeUrl.getPayType()) {
             case "ali":
                 return aliPayService.pay(payOrder);
             case "wx":
-                return wxService.pay(payOrder);
+                return "暂未开通";
             default:
                 return "不支持的支付方式";
         }

+ 29 - 0
module-erp/src/main/java/com/hys/app/controller/erp/use/task/OrderReturnTask.java

@@ -0,0 +1,29 @@
+package com.hys.app.controller.erp.use.task;
+
+import com.hys.app.mapper.erp.OrderReturnMapper;
+import com.hys.app.model.erp.dos.OrderReturnDO;
+import com.hys.app.service.erp.OrderManager;
+import lombok.AllArgsConstructor;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@AllArgsConstructor
+public class OrderReturnTask {
+
+    private OrderReturnMapper orderReturnMapper;
+    private OrderManager orderManager;
+
+    @Scheduled(cron = "0 0 1 * * ?")
+    public void executeTask() {
+//       List<OrderReturnDO> list = orderReturnMapper.getAllNotClosedReturn();
+
+
+
+
+        System.out.println("Task executed at 1:00 AM");
+        // 在这里添加您的任务逻辑
+    }
+}

+ 16 - 0
module-erp/src/main/java/com/hys/app/mapper/erp/OrderCustomerFeeMapper.java

@@ -0,0 +1,16 @@
+package com.hys.app.mapper.erp;
+
+import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
+import com.hys.app.model.erp.dos.OrderCustomerFee;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 订单 Mapper
+ *
+ * @author 张崧
+ * 2024-01-24 15:58:31
+ */
+@Mapper
+public interface OrderCustomerFeeMapper extends BaseMapperX<OrderCustomerFee> {
+}
+

+ 1 - 0
module-erp/src/main/java/com/hys/app/mapper/erp/OrderReturnMapper.java

@@ -53,5 +53,6 @@ public interface OrderReturnMapper extends BaseMapperX<OrderReturnDO> {
      * @return
      */
     List<OrderReturnStatistics> selectOrderReturnList(@Param("param") OrderReturnStatisticsQueryParam param);
+
 }
 

+ 3 - 0
module-erp/src/main/java/com/hys/app/mapper/goods/SpecificationMapper.java

@@ -51,4 +51,7 @@ public interface SpecificationMapper extends BaseMapper<SpecificationDO> {
      */
     List<SpecificationVO> queryAdminSpec(@Param("category_id") Long categoryId);
 
+
+    List<SpecificationVO> getList();
+
 }

+ 49 - 0
module-erp/src/main/java/com/hys/app/model/erp/dos/OrderCustomerFee.java

@@ -0,0 +1,49 @@
+package com.hys.app.model.erp.dos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hys.app.framework.database.mybatisplus.base.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+
+
+/**
+ * 商品实体类
+ *
+ * @author 张崧
+ * 2023-12-26 15:56:58
+ */
+@TableName("erp_order_customer_fee")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class OrderCustomerFee extends BaseDO {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(hidden = true)
+    private Long id;
+
+    @ApiModelProperty("订单id")
+    private Long orderId;
+
+    @ApiModelProperty("附件地址")
+    private String  file_url;
+
+    @ApiModelProperty("报销费用")
+    private BigDecimal money;
+
+    @ApiModelProperty("公司人员姓名")
+    private String userAll;
+
+    @ApiModelProperty("核销人电话")
+    private String userPhone;
+
+}

+ 3 - 2
module-erp/src/main/java/com/hys/app/model/erp/dto/ProductDTO.java

@@ -23,7 +23,6 @@ import java.util.List;
 public class ProductDTO {
 
     @ApiModelProperty(hidden = true)
-    @JsonIgnore
     private Long id;
 
     private Long goodsId;
@@ -35,7 +34,6 @@ public class ProductDTO {
     private String barCode;
 
     @ApiModelProperty(name = "sku", value = "sku")
-    @Min(value = 5)
     private String sku;
 
     @ApiModelProperty(name = "price", value = "售价")
@@ -68,5 +66,8 @@ public class ProductDTO {
     @ApiModelProperty(name = "hireOrSail", value = "商品相册")
     private String hireOrSail;
 
+
+    @ApiModelProperty(name = "cost_price", value = "商品相册")
+    private Double costPrice;
 }
 

+ 3 - 0
module-erp/src/main/java/com/hys/app/model/erp/vo/OrderVO.java

@@ -2,6 +2,7 @@ package com.hys.app.model.erp.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.hys.app.model.erp.dos.OrderCustomerFee;
 import com.hys.app.model.erp.dos.OrderDO;
 import com.hys.app.model.erp.dos.OrderPaymentDO;
 import com.hys.app.model.erp.dos.StoreDO;
@@ -109,6 +110,8 @@ public class OrderVO extends OrderDO {
 
     @ApiModelProperty(name = "subtract_stock", value = "入库扫描订单的类型")
     private String  scanOrderType;
+    @ApiModelProperty(name = "subtract_stock", value = "核销费用列表")
+    List<OrderCustomerFee> orderCustomerFees;
 
 
 }

+ 1 - 1
module-erp/src/main/java/com/hys/app/pay/ali/AliPayService.java

@@ -35,7 +35,7 @@ public class AliPayService {
             model.setTotalAmount(payOrder.getTotalAmount().toString());
             model.setSubject(payOrder.getSubject());
             request.setBizModel(model);
-            AlipayTradeWapPayResponse response = alipayClient.pageExecute(request, "POST");
+            AlipayTradeWapPayResponse response = alipayClient.pageExecute(request, "GET");
             // 如果需要返回GET请求,请使用
             // AlipayTradeWapPayResponse response = alipayClient.pageExecute(request, "GET");
             String pageRedirectionData = response.getBody();

+ 26 - 0
module-erp/src/main/java/com/hys/app/service/erp/OrderCustomerFeeManager.java

@@ -0,0 +1,26 @@
+package com.hys.app.service.erp;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hys.app.framework.database.BaseQueryParam;
+import com.hys.app.framework.database.WebPage;
+import com.hys.app.framework.database.mybatisplus.base.BaseService;
+import com.hys.app.model.erp.dos.OrderCustomerFee;
+import com.hys.app.model.erp.dos.OrderDO;
+import com.hys.app.model.erp.dos.OrderSendDO;
+import com.hys.app.model.erp.dto.OrderDTO;
+import com.hys.app.model.erp.dto.OrderQueryParams;
+import com.hys.app.model.erp.dto.WarehouseOutShipDTO;
+import com.hys.app.model.erp.vo.OrderVO;
+import com.hys.app.service.kuaidiniao.entity.PreOrderModelDTO;
+import com.hys.app.service.kuaidiniao.entity.resReturnBackBase;
+
+/**
+ * 订单业务层接口
+ *
+ * @author 张崧
+ * 2024-01-24 15:58:31
+ */
+public interface OrderCustomerFeeManager extends BaseService<OrderCustomerFee> {
+
+}
+

+ 17 - 0
module-erp/src/main/java/com/hys/app/service/erp/OrderManager.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hys.app.framework.database.BaseQueryParam;
 import com.hys.app.framework.database.WebPage;
 import com.hys.app.framework.database.mybatisplus.base.BaseService;
+import com.hys.app.model.erp.dos.OrderCustomerFee;
 import com.hys.app.model.erp.dos.OrderDO;
 import com.hys.app.model.erp.dos.OrderSendDO;
 import com.hys.app.model.erp.dto.OrderDTO;
@@ -129,5 +130,21 @@ public interface OrderManager extends BaseService<OrderDO> {
      * @param id
      */
     void returnOrder(Long id);
+
+    /**
+     * 添加费用核销单
+     *
+     * @param orderCustomerFee
+     * @return
+     */
+    Long addOrderCustomerFee(OrderCustomerFee orderCustomerFee);
+
+    /**
+     * 修改费用核销单
+     *
+     * @param id
+     * @param orderCustomerFee
+     */
+    void editOrderCustomerFee(Long id, OrderCustomerFee orderCustomerFee);
 }
 

+ 1 - 3
module-erp/src/main/java/com/hys/app/service/erp/impl/GoodsManagerImpl.java

@@ -67,10 +67,10 @@ public class GoodsManagerImpl extends BaseServiceImpl<GoodsMapper, GoodsDO> impl
         GoodsDO goodsDO = BeanUtil.copyProperties(goodsDTO, GoodsDO.class);
         List<ProductDO> bean = BeanUtils.toBean(goodsDTO.getProductList(), ProductDO.class);
         // 保存相册
+        super.save(goodsDO);
         this.goodsGalleryManager.add(goodsDTO.getImageList(), goodsDO.getId());
         GoodsGalleryDO goodsGallery = goodsGalleryManager.getGoodsGallery(goodsDTO.getImageList().get(0).getOriginal());
         goodsDO.setImageSmallList(goodsGallery.getSmall());
-        super.save(goodsDO);
         bean.forEach(item ->{
             item.setGoodsId(goodsDO.getId());
             item.setHireOrSail(goodsDO.getHireOrSail());
@@ -82,8 +82,6 @@ public class GoodsManagerImpl extends BaseServiceImpl<GoodsMapper, GoodsDO> impl
         productManager.updateBatchById(bean);
         //初始化库存
         productStockManager.intStock(bean);
-        ;
-
         // 发送商品消息
 //        GoodsChangeMessage message = new GoodsChangeMessage(GoodsChangeMessage.GoodsChangeType.Add, goodsId);
 //        this.messageSender.send(new MqMessage(AmqpExchange.ERP_GOODS_CHANGE, AmqpExchange.ERP_GOODS_CHANGE + "_ROUTING", message));

+ 50 - 0
module-erp/src/main/java/com/hys/app/service/erp/impl/OrderCustomerFeeManagerImpl.java

@@ -0,0 +1,50 @@
+package com.hys.app.service.erp.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hys.app.converter.erp.OrderConverter;
+import com.hys.app.framework.database.BaseQueryParam;
+import com.hys.app.framework.database.WebPage;
+import com.hys.app.framework.database.mybatisplus.base.BaseServiceImpl;
+import com.hys.app.framework.exception.ServiceException;
+import com.hys.app.framework.util.BeanUtils;
+import com.hys.app.mapper.erp.OrderCustomerFeeMapper;
+import com.hys.app.mapper.erp.OrderMapper;
+import com.hys.app.mapper.erp.WarehouseOutMapper;
+import com.hys.app.mapper.goods.GoodsMapper;
+import com.hys.app.model.erp.dos.*;
+import com.hys.app.model.erp.dto.*;
+import com.hys.app.model.erp.enums.*;
+import com.hys.app.model.erp.vo.GoodsVO;
+import com.hys.app.model.erp.vo.OrderSendItemVO;
+import com.hys.app.model.erp.vo.OrderVO;
+import com.hys.app.model.erp.vo.ProductVO;
+import com.hys.app.service.erp.*;
+import com.hys.app.service.kuaidiniao.GaoDeUtil;
+import com.hys.app.service.kuaidiniao.entity.PreOrderModelDTO;
+import com.hys.app.service.kuaidiniao.entity.resReturnBackBase;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 订单业务层实现
+ *
+ * @author 张崧
+ * 2024-01-24 15:58:31
+ */
+@Service
+@AllArgsConstructor
+public class OrderCustomerFeeManagerImpl extends BaseServiceImpl<OrderCustomerFeeMapper, OrderCustomerFee> implements OrderCustomerFeeManager {
+
+
+}
+

+ 17 - 1
module-erp/src/main/java/com/hys/app/service/erp/impl/OrderManagerImpl.java

@@ -62,6 +62,7 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
     private ItemSnCodeManager itemSnCodeManager;
     private GoodsSnManager goodsSnManager;
     private LockedStockDetailManager lockedStockDetailManager;
+    private OrderCustomerFeeManager orderCustomerFeeManager;
 
     @Override
     public WebPage<OrderVO> list(OrderQueryParams queryParams) {
@@ -127,8 +128,10 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
             GoodsVO goodsVO = BeanUtil.copyProperties(goodsMapper.selectById(productVO.getGoodsId()), GoodsVO.class);
             dto.setGoodsVO(goodsVO);
             dto.setUsableStock(productStockManager.getById(dto.getProductStockId()).getUsableStock());
-
         }
+        //核销费用
+        List<OrderCustomerFee> orderCustomerFees = orderCustomerFeeManager.list(new LambdaQueryWrapper<OrderCustomerFee>().eq(OrderCustomerFee::getOrderId, id));
+        orderVO.setOrderCustomerFees(orderCustomerFees);
         orderVO.setItemList(itemList);
         return orderVO;
     }
@@ -587,5 +590,18 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
         updateById(aDo);
         orderSendManager.remove(new LambdaQueryWrapper<OrderSendDO>().eq(OrderSendDO::getOrderId, id));
     }
+
+    @Override
+    public Long addOrderCustomerFee(OrderCustomerFee orderCustomerFee) {
+        orderCustomerFeeManager.save(orderCustomerFee);
+        return orderCustomerFee.getId();
+    }
+
+    @Override
+    public void editOrderCustomerFee(Long id, OrderCustomerFee orderCustomerFee) {
+        OrderCustomerFee byId = orderCustomerFeeManager.getById(id);
+        BeanUtil.copyProperties(orderCustomerFee,byId);
+        orderCustomerFeeManager.updateById(byId);
+    }
 }
 

+ 2 - 0
module-erp/src/main/java/com/hys/app/service/goods/SpecificationManager.java

@@ -110,4 +110,6 @@ public interface SpecificationManager {
 	 */
 	List<SpecificationVO> queryAdminSpec(Long categoryId);
 
+
+	List<SpecificationVO> getAllCategories();
 }

+ 14 - 0
module-erp/src/main/java/com/hys/app/service/goods/impl/SpecificationManagerImpl.java

@@ -1,5 +1,6 @@
 package com.hys.app.service.goods.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -291,6 +292,19 @@ public class SpecificationManagerImpl implements SpecificationManager {
         return specList;
     }
 
+    @Override
+    public List<SpecificationVO> getAllCategories() {
+        //查询规格
+        List<SpecificationVO> specList = specificationMapper.getList();
+        //没有规格
+        if (specList == null || specList.size() == 0) {
+            return new ArrayList<>();
+        }
+        initSpec(specList, null);
+
+        return specList;
+    }
+
     /**
      * 初始化规格信息
      * @param specList 规格信息集合

+ 8 - 0
module-erp/src/main/java/com/hys/app/service/kuaidiniao/KuaiDiNiaoService.java

@@ -55,4 +55,12 @@ public interface KuaiDiNiaoService {
 
     Boolean kdnReturnBackLogistics(Map map);
 
+    /**
+     * 预下单获取时间
+     * @param preOrderModel
+     * @param orderId
+     * @param addressDTO
+     * @return
+     */
+    String prePareTime(PreOrderModelDTO preOrderModel, Long orderId, AddressDTO addressDTO);
 }

+ 18 - 4
module-erp/src/main/java/com/hys/app/service/kuaidiniao/KuaiDiNiaoServiceImpl.java

@@ -170,16 +170,24 @@ public class KuaiDiNiaoServiceImpl implements KuaiDiNiaoService {
                 switch (statusMap.get("intraCode").toString()) {
                     case "SS":
                         createStoreModel.setSsStatus(Integer.parseInt(statusMap.get("storeStatus").toString()));
-                        createStoreModel.setSsReason(statusMap.get("operationFailReason").toString());
+                        if (ObjectUtil.isNotNull(statusMap.get("operationFailReason"))){
+                            createStoreModel.setFnReason(statusMap.get("operationFailReason").toString());
+                        }
                     case "DD":
                         createStoreModel.setDdStatus(Integer.parseInt(statusMap.get("storeStatus").toString()));
-                        createStoreModel.setDdReason(statusMap.get("operationFailReason").toString());
+                        if (ObjectUtil.isNotNull(statusMap.get("operationFailReason"))){
+                            createStoreModel.setFnReason(statusMap.get("operationFailReason").toString());
+                        }
                     case "FN":
                         createStoreModel.setFnStatus(Integer.parseInt(statusMap.get("storeStatus").toString()));
-                        createStoreModel.setFnReason(statusMap.get("operationFailReason").toString());
+                        if (ObjectUtil.isNotNull(statusMap.get("operationFailReason"))){
+                            createStoreModel.setFnReason(statusMap.get("operationFailReason").toString());
+                        }
                     case "MTPS":
                         createStoreModel.setMtStatus(Integer.parseInt(statusMap.get("storeStatus").toString()));
-                        createStoreModel.setMtReason(statusMap.get("operationFailReason").toString());
+                        if (ObjectUtil.isNotNull(statusMap.get("operationFailReason"))){
+                            createStoreModel.setFnReason(statusMap.get("operationFailReason").toString());
+                        }
                 }
             }
             kdnMapper.updateById(createStoreModel);
@@ -225,6 +233,12 @@ public class KuaiDiNiaoServiceImpl implements KuaiDiNiaoService {
         }
     }
 
+    @Override
+    public String prePareTime(PreOrderModelDTO preOrderModel, Long orderId, AddressDTO addressDTO) {
+
+        return null;
+    }
+
 
     /**
      * @param dataJson 业务参数

+ 3 - 0
module-erp/src/main/resources/mapper/goods/SpecificationMapper.xml

@@ -26,5 +26,8 @@
         select s.spec_id,s.spec_name from es_specification s inner join es_category_spec cs on s.spec_id=cs.spec_id
         where cs.category_id = #{category_id} and (s.seller_id=0)
     </select>
+    <select id="getList" resultType="com.hys.app.model.goods.vo.SpecificationVO">
+        select  * from es_specification;
+    </select>
 
 </mapper>

+ 4 - 4
server/src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
   application:
     name: erp-server
   profiles:
-    active: test
+    active: local
   jackson:
     property-naming-strategy: SNAKE_CASE
   servlet:
@@ -53,11 +53,11 @@ shop-tnt:
 
 alipay:
   #APPID
-  appId: 2021004149672278
+  appId: 2021004150628230
   #沙箱应用-->应用信息-->开发信息-->接口加签方式-->系统默认密钥-->公钥模式-->查看-->应用私钥
-  appPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDXZL28wSR7KNn55tvi0GsPg2rNTNsSnXAV3CxTYUMVS58r7FxOZ0Abite9iavMK7LxImnh321G86yACEuEMBp6D6ArfI0Ww7bApm2OKQRIQXhLaz9+uFpirBhXn5OM3T4aWggBQLXLMg1UMhqky1dtMzi++8GjY0twPcY4hfuA/iRpl9L+4hHeTbh9BHH30HJAKSfZJhTBJiSyOEYXPBdH7ztiLobCRClEsdTT6zQE1x35jQF0y+2KDxvHPxsqMDn/DtJ5mLq/6w7S+AvwOONABGaOj2b5nuHKWPEUod3NBHiPRdgXa1JRyLof/2YYN5pLm48kA0nYeHVOLA+yhHxhAgMBAAECggEAIJEd0w1M68Y4dv1936Rtm5HeMx5cvUrKqLN6jDzXfL/LWEPLjRs1aTSr+/9111AAJU9zvPAgQKsVOOKIMHtpdW0pZYnWd0uuNSC0zdrLx/UGMDkOB6XuHJ8yqwT4tUK6YhecwDu9gPSXaVSODL6mAF/PQ6kjFQYtYNImR2OSrGT5rvQsjlDUNE2GBXWnuEB1m94CNnMCZqF1YN913wKFYLrsr2GVpPik+mpnwofsOft8l6Cyar7m7bITZCItb7cuiJ1qlFODc0o4gFyr5QaNmSz5/5ux8WlPxSujXQC5/u6XHAjhtCBEP96pwjZ8KQeqgtwj7bkpuNYydexIxeVyJQKBgQDtYWyR8hj6yw0EdJElcXTaq9VemXSmwUo7GD/MB3mZbiUN63SCbsiYbVQJxBmsurKE61o/l/MQadwzQyHlrDtmS+bgsoQcL1rIjjxvkfM/TjsUe8/o01OxxFY2H4/WKzbnft07BKvDgI7ZE2mG6HBzShSyF26e5dqmiHxD9KTLEwKBgQDoSdHTXgbmbJ+WUrV1PkyPRyRTMkdoA9ddg9WHTYV1hn1VUcaFOpiUdOYe2L8JbGhf0+gk9GaGqoUWZNAnaiaUM9DtQ17tShFt9kRmqjc1U1nJNai+X3XPkY+y2rdf3iN+PXCAAjBRgc+uPBcDCE5v0k8rIFeboKTNJDlS7p51OwKBgHNlX/UW3sPUP7DBxemQ3QCMdf411TpXTnGp2SGjJJ7Mp6C7rHjXyBYpV6gjt2N7otrw2n99q4B4Jb6ZzPmsn3ecQFFNFuHot1Y1pvWJ2tkUe636flitmssZKdvHvhGcEmW5C2zsWV+BuG+Yez1E851oDuWAdJs0G/XG9bnHTPEXAoGBANLfiPtwRaVTgQDvbsnT157Of7yDTW2w5wd/Eg51oq2RfSBCT41NJ4zGHs5sB+lfH9W2wu0hbh3cmVs+A/V0GTe7XnS2D2wtLGt+AJSO+/WOCFlwPBMvB/16cFB227fNKr2EuyeKVSD5TncnF+Dp3oMHElXdU4r1qAaPVvbhprpXAoGBAKBgXA57BTSvD/NvN/Rkni7jhL8ob6JJKzD7o9pzh32TaF9YiSA/7L5G9wr7NsYpFyWEOuk91mUNp0xVbglASXWayUgfUEJ8UdkPJQfDTITGvVVF4QQ1w5BRxuDT1a4W/b9ECSWbpkqAg2R53R78m2seyKeiIQbQdr4lRSy/XYTP
+  appPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCAg9tPZe2hPnUSIqF+hb9CP+D5pZ+dm1kbFsHrEEP1Vj7rDotaJz1clyjuewvUzXUbBVRUk2zViseze9msoZbz58W9ormvUSivczBx/+rfIAV6CPdNIXa+UpSZLnaumIAoT4CtiTZwnm5QzIhJZdlM7ZVf70ye61/9uWQV74x+d6TsQxQ6iUlyeq6BfSO0LI/7S3iTEUVoJM4szo4bSe44COyExMG2csqdSVwEgmiJVUTocXbOElAsogqHMfl7hj0A/wXBKH9922N1OXTxlhhuEV5oHPUXBmCs+yEfFgh/KkKez584rOoch+6scZLAlqgr5uzl0Wh6yIOsq/9i72EdAgMBAAECggEAVDcTxenjWGCXUvUCouh+Nqmpga649AzSzV+SX7le7yw/OsVjKAbCvSQJHI3haOfiL3zEkE+zaBPzXXhxYiDZzKc6+1PhHjOu15pCStILVX+kVx39ALxHFd0Dp4W9HBivErtWdWGPHSmU3LnLLV3ikfi2hBFKQnG3i4qrPXymslBDN85HWZhdSctUXxNRCbwnee8XOffYt+NNHAwI6pveOW5HnXOaUzjRcoepYXOBBkDIrwx/5W1hgaUv4jIu5v4LG35C2IEy1d+6fHvvjQhK2y29eEpJ889n9Gb1lrvsuqHS/knDiFq66GaTSzIl/qJjMpYLEcNcefpIqB/bmw9dgQKBgQC1yBvpaprNDcE1i5hZANvdjryIkXKwfMi6XO5IXxHLqxNYXQV1KSLABA8PzBtCWYFnlGXiNh+06QxPnCRRrB6YgVQYi4d7rjHVaKegHkPHHR3/hMm8CXQwKpjLutEMu3QVprtZl4wPT/VU6ggnhxUpi36YfD5SwOrzRLVVTmqPkQKBgQC0/E0JT/N/8fvmjnwOir/o2/EVgaegWqakquY3OO4bS1mMygJ394GuLvkDgHEmGtWNSQvQMRnxgFK1L/lGO+OSFQF6WU+jvNupIm6XASBpvErWj3GWLL0lSroda4JNHdaX+tQiCqv57rhfBXbS7dKyLuc3kwlZYxTCSPy7+DLKzQKBgQCGgDC+zYUKkdHSd55axHrp/RHcjpnoofu3gMlCPS2in8sph3JhVPWEU7x9OM02k5le9XtJHDjrl7/nK6Xn1E2zE4YQvzSYu7PdrpjQrXQC4LVweWT2v5v7g5kYrPq+y/hBiON4j9wu/D+O+7ba4GU1HySlWNCYVGvDYaQ2IVZRMQKBgAasu2aZhUB1uzWQkbCzm0pKOkTxyC3YygaOqvjkZ5uoFsBjft3Pyf+TiemAJiwilzejtwTRmsRWWDaIc2gMs2Li1XAetRozz+IX+/4js39Sy2vIVIcWVU93xw9otKCFdjGatZIf1KHeFPykJfK3hKq/ohVhndmnFs/ngzKnf7ANAoGAJ6obEOg3StqXvKATsXNClHYbqSEi73rMSUhvfj5StxfXiMwta99zq5R5nLXWXI6DqCsVstIugqNbDsWQmffzHl+MSUnBWnkZYl5EzBhoz6w0Q/16Gn20dqvLCdkVADnHowzVnT8tWCif6kcD5NG89kwCkdUN7GESc/Y1+9t+OWI=
   #沙箱应用-->应用信息-->开发信息-->接口加签方式-->系统默认密钥-->公钥模式-->查看-->支付宝公钥
-  alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA12S9vMEkeyjZ+ebb4tBrD4NqzUzbEp1wFdwsU2FDFUufK+xcTmdAG4rXvYmrzCuy8SJp4d9tRvOsgAhLhDAaeg+gK3yNFsO2wKZtjikESEF4S2s/frhaYqwYV5+TjN0+GloIAUC1yzINVDIapMtXbTM4vvvBo2NLcD3GOIX7gP4kaZfS/uIR3k24fQRx99ByQCkn2SYUwSYksjhGFzwXR+87Yi6GwkQpRLHU0+s0BNcd+Y0BdMvtig8bxz8bKjA5/w7SeZi6v+sO0vgL8DjjQARmjo9m+Z7hyljxFKHdzQR4j0XYF2tSUci6H/9mGDeaS5uPJANJ2Hh1TiwPsoR8YQIDAQAB
+  alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwjbDKtCtW9OHHGfOfbDV0Jn5cVSjTZglJpbRqmVLnWs1U51QQuOoB1ilriqWJDpmd0YApslxw13eGCAgdIuSwo2fBJiDdG8fLYzHuopQVNxIENK1WNL8ispnBuo8z+HrwheR2sTfFPXxEqTYyMQdtkbNu1PJ9GJD1EuJRXlvCkieFFlNklulzCCmOtzR2gFRoDaccTqBddbI8E4fpTAK9vDkrinRAbQsoWs6vdfth0qfMZFyvQFQtSRiX8JPfsMVgNsqOErPu0HqFrKPvhf3ZLJylRkEiY5+AzRO91OxsmhmQcNsdz+fpFCz2hJ5igVhssG0hHWn3o6cH5nqw4E7MwIDAQAB
   #回调地址
   notifyUrl:
   #网关地址