代服管家3

fs-admin/src/main/java/com/fs/his/controller/FsStoreOrderController.java

@@ -24,6 +24,7 @@ import com.fs.erp.dto.ErpDeliverysResponse;
 import com.fs.erp.dto.ErpOrderQueryRequert;
 import com.fs.erp.dto.ErpOrderQueryResponse;
 import com.fs.erp.dto.df.BspOrderResponse;
+import com.fs.erp.dto.df.DFConfigVo;
 import com.fs.erp.service.IErpOrderService;
 import com.fs.framework.web.service.TokenService;
 import com.fs.his.config.FsSysConfig;
@@ -36,9 +37,7 @@ import com.fs.his.param.FsFollowMsgParam;
 import com.fs.his.param.FsStoreOrderParam;
 import com.fs.his.param.FsStoreOrderSalesParam;
 import com.fs.his.param.FsStoreOrderSetErpPhoneParam;
-import com.fs.his.service.IFsExportTaskService;
-import com.fs.his.service.IFsExpressService;
-import com.fs.his.service.IFsStoreService;
+import com.fs.his.service.*;
 import com.fs.his.utils.ConfigUtil;
 import com.fs.his.vo.*;
 import com.fs.system.domain.SysConfig;
@@ -53,7 +52,6 @@ import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.enums.BusinessType;
-import com.fs.his.service.IFsStoreOrderService;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.common.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
@@ -104,6 +102,9 @@ public class FsStoreOrderController extends BaseController
 
     @Autowired
     SysConfigMapper sysConfigMapper;
+
+    @Autowired
+    private IFsStoreOrderDfService fsStoreOrderDfService;
     /**
      * 查询订单列表
      */
@@ -503,6 +504,14 @@ public class FsStoreOrderController extends BaseController
     @PostMapping(value = "/batchCreateErpOrder")
     public R batchCreateErpOrder(@RequestBody FsStoreOrderSetErpPhoneParam param)
     {
+        String loginAccount = param.getLoginAccount();
+        if (StringUtils.isBlank(loginAccount)){
+            return R.error("未选择推送erp账户");
+        }
+        FsStoreOrderDf df = getDFInfo(loginAccount);
+        if (df.getLoginAccount() == null){
+            return R.error("未查询到所选erp账户");
+        }
         List<Long> orderIds = param.getOrderIds();
         if (orderIds  == null || orderIds.isEmpty()) {
             if (param.getUserPhoneMk() != null && !param.getUserPhoneMk().isEmpty()) {
@@ -516,6 +525,8 @@ public class FsStoreOrderController extends BaseController
         }
         orderIds.forEach(orderId->{
             try {
+                df.setOrderId(orderId);
+                fsStoreOrderDfService.insertFsStoreOrderDf(df);
                 fsStoreOrderService.createOmsOrder(orderId);
             } catch (ParseException e) {
                 throw new RuntimeException(e);
@@ -525,6 +536,24 @@ public class FsStoreOrderController extends BaseController
         return R.ok();
     }
 
+    private FsStoreOrderDf getDFInfo(String loginAccount) {
+        //查询订单账户 判断是否存在该订单账户
+        List<DFConfigVo> erpAccounts = fsStoreOrderService.getErpAccount();
+        FsStoreOrderDf df = new FsStoreOrderDf();
+        for (DFConfigVo erpAccount : erpAccounts) {
+            if (loginAccount.equals(erpAccount.getLoginAccount())){
+                //添加df记录
+                df.setAppKey(erpAccount.getDfAppKey());
+                df.setAppSecret(erpAccount.getDfAppsecret());
+                df.setLoginAccount(loginAccount);
+                df.setMonthlyCard(erpAccount.getMonthlyCard());
+                df.setStatus(0);
+                break;
+            }
+        }
+        return df;
+    }
+
     @Log(title = "冻结/解冻", businessType = BusinessType.UPDATE)
     @PreAuthorize("@ss.hasPermi('his:storeOrder:editTuiMoney')")
     @GetMapping(value = "/editTuiMoney/{id}")
@@ -690,4 +719,15 @@ public class FsStoreOrderController extends BaseController
         }
         return toAjax(fsStoreOrderService.batchUpdateErpByOrderIds(param));
     }
+
+    /**
+     * 获取erp账户
+     */
+    @GetMapping("/getErpAccount")
+    public R getErpAccount()
+    {
+        List<DFConfigVo> erpAccounts = fsStoreOrderService.getErpAccount();
+        List<String> list = erpAccounts.stream().map(DFConfigVo::getLoginAccount).collect(Collectors.toList());
+        return R.ok().put("data", list);
+    }
 }

fs-service/src/main/java/com/fs/erp/service/impl/DfOrderServiceImpl.java

@@ -84,6 +84,7 @@ public class DfOrderServiceImpl implements IErpOrderService
 
     /**
      * 退款 取消订单
+     *
      * @param order
      * @return
      */
@@ -93,44 +94,42 @@ public class DfOrderServiceImpl implements IErpOrderService
         String orderCode = order.getOrderCode();
         FsStoreOrder fsStoreOrder = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(orderCode);
         FsStoreOrderDf df = fsStoreOrderDfMapper.selectFsStoreOrderDfByOrderId(fsStoreOrder.getOrderId());
-        Integer sfAccountIndex = getIndex(fsStoreOrder);
-        if (sfAccountIndex > -1) {
-            HashMap<String, Object> map = new HashMap<>();
-            map.put("loginAccount", df.getLoginAccount());
-            DFConfigVo config = getconfig(sfAccountIndex);
-            if ( config != null && StringUtils.isNotBlank(config.getCallBackUrl())){
-                map.put("callBackUrl", config.getCallBackUrl());
-            }
-            map.put("orderNumber", orderCode);
-            map.put("mailNumber", fsStoreOrder.getDeliverySn());
-            try {
-                //2.请求
-                log.info("开始取消订单,参数: {}", JSON.toJSONString(map));
-                String response = client.execute(RequestUrlEnum.ORDER_CANCEL,map ,sfAccountIndex);
-                DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
-                //3.处理请求结果
-                if(dfApiResponse != null && "ok".equals(dfApiResponse.getCode())){
-                    //存储订单推送用的哪个账户
-                    log.info("订单取消成功: {}", response);
-                    //修改df表
-                    df.setStatus(2);
-                    df.setUpdateTime(DateUtils.getNowDate());
-                    fsStoreOrderDfMapper.updateFsStoreOrderDf(df);
-                    //可以回调 也可以查询订单
-                    Map<String,Object> orderResultQueryParam = new HashMap<>();
-                    orderResultQueryParam.put("orderNumber",orderCode);
-                    orderResultQueryParam.put("exInterfaceType",2); //2为查询取消订单结果
+        Integer sfAccountIndex = getSFAccountIndex(fsStoreOrder.getOrderId());
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("loginAccount", df.getLoginAccount());
+        DFConfigVo config = getconfig(sfAccountIndex);
+        if (config != null && StringUtils.isNotBlank(config.getCallBackUrl())) {
+            map.put("callBackUrl", config.getCallBackUrl());
+        }
+        map.put("orderNumber", orderCode);
+        map.put("mailNumber", fsStoreOrder.getDeliverySn());
+        try {
+            //2.请求
+            log.info("开始取消订单,参数: {}", JSON.toJSONString(map));
+            String response = client.execute(RequestUrlEnum.ORDER_CANCEL, map, sfAccountIndex);
+            DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
+            //3.处理请求结果
+            if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
+                //存储订单推送用的哪个账户
+                log.info("订单取消成功: {}", response);
+                //修改df表
+                df.setStatus(2);
+                df.setUpdateTime(DateUtils.getNowDate());
+                fsStoreOrderDfMapper.updateFsStoreOrderDf(df);
+                //可以回调 也可以查询订单
+                Map<String, Object> orderResultQueryParam = new HashMap<>();
+                orderResultQueryParam.put("orderNumber", orderCode);
+                orderResultQueryParam.put("exInterfaceType", 2); //2为查询取消订单结果
 //                    getOrderResult(orderResultQueryParam,sfAccountIndex);
-                    ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
-                    erpOrderResponse.setCode(orderCode);
-                    erpOrderResponse.setSuccess(true);
-                    return erpOrderResponse;
-                } else {
-                    throw new RuntimeException(String.format("订单取消失败,原因: %s",dfApiResponse.getMsg()));
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
+                ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
+                erpOrderResponse.setCode(orderCode);
+                erpOrderResponse.setSuccess(true);
+                return erpOrderResponse;
+            } else {
+                throw new RuntimeException(String.format("订单取消失败,原因: %s", dfApiResponse.getMsg()));
             }
+        } catch (IOException e) {
+            e.printStackTrace();
         }
         return new ErpOrderResponse();
     }
@@ -143,11 +142,11 @@ public class DfOrderServiceImpl implements IErpOrderService
             FsStoreOrder order = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(orderCode);
             if (order != null) {
                 String mailNumber = order.getDeliverySn();
-                Integer sfAccountIndex = getIndex(order);
-                if (StringUtils.isNotBlank(mailNumber) && sfAccountIndex > -1){
+                Integer sfAccountIndex = getSFAccountIndex(order.getOrderId());
+                if (StringUtils.isNotBlank(mailNumber) && sfAccountIndex > -1) {
                     try {
-                        Map<String,Object> map = new HashMap<>();
-                        map.put("mailNumber",mailNumber);
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("mailNumber", mailNumber);
                         log.info("开始查询路由结果,参数为: {}", JSON.toJSONString(map));
                         String response = client.execute(RequestUrlEnum.ORDER_DELIVERY, map, sfAccountIndex);
                         DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
@@ -172,7 +171,7 @@ public class DfOrderServiceImpl implements IErpOrderService
                                 }
                                 erpDeliverysResponse.setDeliverys(dfDeliveryResponse);
                             }
-                        } else{
+                        } else {
                             erpDeliverysResponse.setErrorDesc(dfApiResponse.getMsg());
                         }
                     } catch (IOException e) {
@@ -190,26 +189,10 @@ public class DfOrderServiceImpl implements IErpOrderService
         return erpDeliverysResponse;
     }
 
-    private @NotNull Integer getIndex(FsStoreOrder order) {
-        //获取下单账户
-        FsStoreOrderDf df = fsStoreOrderDfMapper.selectFsStoreOrderDfByOrderId(order.getOrderId());
-        Integer sfAccountIndex = -1;
-        if (df != null) {
-            List<DFConfigVo> dfConfigVos = getDfConfigVos();
-            if (dfConfigVos != null && !dfConfigVos.isEmpty()) {
-                for (int i = 0; i < dfConfigVos.size(); i++) {
-                    if (df.getLoginAccount().equals(dfConfigVos.get(i).getLoginAccount())) {
-                        return sfAccountIndex = i;
-                    }
-                }
-            }
-        }
-        return sfAccountIndex;
-    }
-
 
     /**
      * 目前仅查询下单用户
+     *
      * @param requset
      * @return
      */
@@ -222,12 +205,12 @@ public class DfOrderServiceImpl implements IErpOrderService
             if (order != null) {
                 //获取下单账户
                 FsStoreOrderDf df = fsStoreOrderDfMapper.selectFsStoreOrderDfByOrderId(order.getOrderId());
-                Integer sfAccountIndex = getIndex(order);
-                if (sfAccountIndex > -1){
-                    Map<String,Object> orderResultQueryParam = new HashMap<>();
-                    orderResultQueryParam.put("orderNumber",orderNumber);
-                    orderResultQueryParam.put("exInterfaceType",df.getStatus());
-                    getOrderResult(orderResultQueryParam,sfAccountIndex);
+                Integer sfAccountIndex = getSFAccountIndex(order.getOrderId());
+                if (sfAccountIndex > -1) {
+                    Map<String, Object> orderResultQueryParam = new HashMap<>();
+                    orderResultQueryParam.put("orderNumber", orderNumber);
+                    orderResultQueryParam.put("exInterfaceType", df.getStatus());
+                    getOrderResult(orderResultQueryParam, sfAccountIndex);
                     return response;
                 }
             }
@@ -252,35 +235,37 @@ public class DfOrderServiceImpl implements IErpOrderService
 
     /**
      * 获取erp推送参数
+     *
      * @param order 订单参数
      * @return
      */
     private ErpOrderResponse getErpOrderResponse(ErpOrder order) {
-        int sfAccountIndex = getSFAccountIndex();
+
         FsStoreOrder fsStoreOrder = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(order.getPlatform_code());
         if (fsStoreOrder == null) {
             return null;
         }
+        int sfAccountIndex = getSFAccountIndex(fsStoreOrder.getOrderId());
         //1.获取请求参数
-        ExternalOrderRequestVo vo= getCreateOrderRequestParam(order,fsStoreOrder,sfAccountIndex);
-        if (vo == null){
+        ExternalOrderRequestVo vo = getCreateOrderRequestParam(order, fsStoreOrder, sfAccountIndex);
+        if (vo == null) {
             return null;
         }
         try {
-            Map<String,Object> map = JSON.parseObject(JSON.toJSONString(vo), Map.class);
+            Map<String, Object> map = JSON.parseObject(JSON.toJSONString(vo), Map.class);
             //2.请求
             log.info("开始推送订单,参数: {}", JSON.toJSONString(map));
-            String response = client.execute(RequestUrlEnum.CREAT_ORDER,map ,sfAccountIndex);
+            String response = client.execute(RequestUrlEnum.CREAT_ORDER, map, sfAccountIndex);
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
             //3.处理请求结果
-            if(dfApiResponse != null && "ok".equals(dfApiResponse.getCode())){
+            if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
                 //存储订单推送用的哪个账户
                 FsStoreOrderDf df = addDfOrder(fsStoreOrder, sfAccountIndex);
                 log.info("订单推送成功: {}", response);
                 //可以回调 也可以查询订单
-                Map<String,Object> orderResultQueryParam = new HashMap<>();
-                orderResultQueryParam.put("orderNumber",order.getPlatform_code());
-                orderResultQueryParam.put("exInterfaceType",df.getStatus());
+                Map<String, Object> orderResultQueryParam = new HashMap<>();
+                orderResultQueryParam.put("orderNumber", order.getPlatform_code());
+                orderResultQueryParam.put("exInterfaceType", df.getStatus());
 //                try {
 //                    getOrderResult(orderResultQueryParam,sfAccountIndex);
 //                } catch (Exception e) {
@@ -291,7 +276,7 @@ public class DfOrderServiceImpl implements IErpOrderService
                 erpOrderResponse.setSuccess(true);
                 return erpOrderResponse;
             } else {
-                throw new RuntimeException(String.format("订单推送失败,原因: %s",dfApiResponse.getMsg()));
+                throw new RuntimeException(String.format("订单推送失败,原因: %s", dfApiResponse.getMsg()));
             }
         } catch (IOException e) {
             e.printStackTrace();
@@ -313,7 +298,7 @@ public class DfOrderServiceImpl implements IErpOrderService
         df.setStatus(1);
         //查询是否存在
         FsStoreOrderDf temp = fsStoreOrderDfMapper.selectFsStoreOrderDfByOrderId(df.getOrderId());
-        if(temp != null){
+        if (temp != null) {
             //修改
             df.setUpdateTime(DateUtils.getNowDate());
             fsStoreOrderDfMapper.updateFsStoreOrderDf(df);
@@ -326,10 +311,11 @@ public class DfOrderServiceImpl implements IErpOrderService
 
     /**
      * 通用erpOrder获取创建订单参数
+     *
      * @param order
      * @return
      */
-    private ExternalOrderRequestVo getCreateOrderRequestParam(ErpOrder order,FsStoreOrder fsStoreOrder,int index) {
+    private ExternalOrderRequestVo getCreateOrderRequestParam(ErpOrder order, FsStoreOrder fsStoreOrder, int index) {
         ExternalOrderRequestVo vo = new ExternalOrderRequestVo();
         DFConfigVo config = getconfig(index);
         if (config == null) {
@@ -341,7 +327,7 @@ public class DfOrderServiceImpl implements IErpOrderService
 
         vo.setLoginAccount(loginAccount); //代服系统登录账号
         String callBackUrl = config.getCallBackUrl();
-        if (StringUtils.isNotBlank(callBackUrl)){
+        if (StringUtils.isNotBlank(callBackUrl)) {
             vo.setCallBackUrl(callBackUrl); //订单下单后异步通知地址
         }
         vo.setOrderNumber(order.getPlatform_code()); //订单号（不能重复）
@@ -352,7 +338,7 @@ public class DfOrderServiceImpl implements IErpOrderService
             couponPrice = BigDecimal.ZERO;
         }
 
-        if (ObjectUtil.equal(1,fsStoreOrder.getPayType())) {
+        if (ObjectUtil.equal(1, fsStoreOrder.getPayType())) {
             //在线支付
             orderPayMethod = 1;
         } else { // 如果是线上付款
@@ -388,10 +374,10 @@ public class DfOrderServiceImpl implements IErpOrderService
         List<FsStoreOrderItem> items = fsStoreOrderItemMapper.selectFsStoreOrderItemListByOrderId(fsStoreOrder.getOrderId());
         if (items != null && items.size() > 0) {
             ArrayList<ExteriorOrderSkuVo> orderSkus = new ArrayList<>();
-            items.forEach(item->{
+            items.forEach(item -> {
                 ExteriorOrderSkuVo skuVo = new ExteriorOrderSkuVo();
                 FsStoreProduct product = fsStoreProductMapper.selectFsStoreProductById(item.getProductId());
-                Asserts.check(ObjectUtils.isNotNull(product),"该产品不存在! 产品id: {} ",item.getProductId());
+                Asserts.check(ObjectUtils.isNotNull(product), "该产品不存在! 产品id: {} ", item.getProductId());
                 skuVo.setProductName(product.getProductName()); //商品名称
                 com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(item.getJsonInfo());
                 skuVo.setSkuCode(jsonObject.getString("sku")); //sku编码
@@ -440,20 +426,39 @@ public class DfOrderServiceImpl implements IErpOrderService
 
     /**
      * 获取账户索引 后续添加规则
+     *
      * @return
      */
-    private int getSFAccountIndex(){
+    private int getSFAccountIndex(Long orderId) {
+        if (orderId != null) {
+            //查询是否选择erp账户
+            FsStoreOrderDf temp = fsStoreOrderDfMapper.selectFsStoreOrderDfByOrderId(orderId);
+            if (temp != null) {
+                FsSysConfig sysConfig = configUtil.getSysConfig();
+                String dfConfigVo = sysConfig.getDfAccounts();
+                List<DFConfigVo> dfConfigVos = JSON.parseArray(dfConfigVo, DFConfigVo.class);
+                if (dfConfigVos != null && !dfConfigVos.isEmpty()) {
+                    for (int i = 0; i < dfConfigVos.size(); i++) {
+                        if (temp.getLoginAccount().equals(dfConfigVos.get(i).getLoginAccount())) {
+                            return i;
+                        }
+                    }
+                }
+                return dfConfigVos.indexOf(temp);
+            }
+        }
+        //默认用第一个
         return 0;
-        //目前用第一个
+
     }
 
-    private void getOrderResult(Map<String,Object> map, Integer sfAccountIndex){
+    private void getOrderResult(Map<String, Object> map, Integer sfAccountIndex) {
         try {
             String status = map.get("exInterfaceType").toString();
             log.info("开始查询订单结果,参数为: {}", JSON.toJSONString(map));
-            String response = client.execute(RequestUrlEnum.ORDER_RESULT,map ,sfAccountIndex);
+            String response = client.execute(RequestUrlEnum.ORDER_RESULT, map, sfAccountIndex);
             DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
-            if(dfApiResponse != null && "ok".equals(dfApiResponse.getCode())){
+            if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
                 log.info("查询订单结果,结果: {}", JSON.toJSONString(dfApiResponse));
                 Object result = dfApiResponse.getResult();
                 if (result != null) {
@@ -461,13 +466,13 @@ public class DfOrderServiceImpl implements IErpOrderService
                     //下单
                     if ("1".equals(status)) {
                         //下单结果
-                        BspOrderResponseWrapper bspOrderResponse = JSONUtil.toBean(jsonString,BspOrderResponseWrapper.class);
+                        BspOrderResponseWrapper bspOrderResponse = JSONUtil.toBean(jsonString, BspOrderResponseWrapper.class);
                         if (bspOrderResponse != null) {
                             setExpress(bspOrderResponse);
                         }
-                    } else if ("2".equals(status)){
+                    } else if ("2".equals(status)) {
                         //取消订单
-                        DFCancelOrderResultResponse cancelResponse = JSONUtil.toBean(jsonString,DFCancelOrderResultResponse.class);
+                        DFCancelOrderResultResponse cancelResponse = JSONUtil.toBean(jsonString, DFCancelOrderResultResponse.class);
                         if (cancelResponse != null) {
                             if (cancelResponse.getIsCancelSuss() == 1) {
                                 log.info("查询订单取消成功,返回结果{}", JSON.toJSONString(cancelResponse));
@@ -479,7 +484,7 @@ public class DfOrderServiceImpl implements IErpOrderService
                 }
 
             } else {
-                throw new RuntimeException(String.format("查询订单失败,原因: %s",dfApiResponse.getMsg()));
+                throw new RuntimeException(String.format("查询订单失败,原因: %s", dfApiResponse.getMsg()));
             }
         } catch (IOException e) {
             e.printStackTrace();
@@ -488,6 +493,7 @@ public class DfOrderServiceImpl implements IErpOrderService
 
     /**
      * 顺丰会有自己的轨迹推送 不使用快递鸟(代服务管家设置推送地址)
+     *
      * @param bspResponse
      */
     private void setExpress(BspOrderResponseWrapper bspResponse) {
@@ -543,13 +549,13 @@ public class DfOrderServiceImpl implements IErpOrderService
                                 }
 
                             }
-                            if (flag.get()){
+                            if (flag.get()) {
                                 break;
                             }
                         }
 
                     }
-                    if (flag.get()){
+                    if (flag.get()) {
                         break;
                     }
                 }

fs-service/src/main/java/com/fs/his/domain/FsStoreOrderDf.java

@@ -25,13 +25,13 @@ public class FsStoreOrderDf extends BaseEntity{
     @Excel(name = "订单编号")
     private String orderCode;
 
-    @Excel(name = "订单编号")
+    @Excel(name = "key")
     private String appKey;
 
-    @Excel(name = "订单编号")
+    @Excel(name = "secret")
     private String appSecret;
 
-    @Excel(name = "订单编号")
+    @Excel(name = "登录账户")
     private String loginAccount;
 
     /** 顺丰月结账户 */
@@ -47,7 +47,7 @@ public class FsStoreOrderDf extends BaseEntity{
     private BigDecimal platformPrice;
 
     /** 平台收款 */
-    @Excel(name = "2:取消订单 1:下单")
+    @Excel(name = "0:默认 1下单 2取消订单")
     private Integer status;
 
 

fs-service/src/main/java/com/fs/his/param/FsStoreOrderSetErpPhoneParam.java

@@ -8,4 +8,5 @@ import java.util.List;
 public class FsStoreOrderSetErpPhoneParam extends FsStoreOrderParam{
     private List<String> erpPhone;
     private List<Long> orderIds;
+    private String loginAccount;
 }

fs-service/src/main/java/com/fs/his/service/IFsStoreOrderService.java

@@ -11,6 +11,7 @@ import com.fs.company.vo.FsStoreOrderStatisticsVO;
 import com.fs.company.vo.FsStoreProductStatisticsVO;
 import com.fs.erp.domain.ErpOrder;
 import com.fs.erp.dto.df.BspOrderResponse;
+import com.fs.erp.dto.df.DFConfigVo;
 import com.fs.erp.service.IErpOrderService;
 import com.fs.his.domain.*;
 import com.fs.his.dto.ExpressInfoDTO;
@@ -235,4 +236,6 @@ public interface IFsStoreOrderService
      * @return
      */
     ExpressInfoDTO getDfExpressInfoDTO(FsStoreOrder order);
+
+    List<DFConfigVo> getErpAccount();
 }

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderDfServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fs.his.service.impl;
 
+import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +11,7 @@ import com.fs.his.service.IFsStoreOrderDfService;
 
 /**
  * 订单代服管家Service业务层处理
- * 
+ *
  * @author fs
  * @date 2025-07-08
  */
@@ -19,7 +20,7 @@ public class FsStoreOrderDfServiceImpl extends ServiceImpl<FsStoreOrderDfMapper,
 
     /**
      * 查询订单代服管家
-     * 
+     *
      * @param orderId 订单代服管家主键
      * @return 订单代服管家
      */
@@ -31,7 +32,7 @@ public class FsStoreOrderDfServiceImpl extends ServiceImpl<FsStoreOrderDfMapper,
 
     /**
      * 查询订单代服管家列表
-     * 
+     *
      * @param fsStoreOrderDf 订单代服管家
      * @return 订单代服管家
      */
@@ -43,19 +44,20 @@ public class FsStoreOrderDfServiceImpl extends ServiceImpl<FsStoreOrderDfMapper,
 
     /**
      * 新增订单代服管家
-     * 
+     *
      * @param fsStoreOrderDf 订单代服管家
      * @return 结果
      */
     @Override
     public int insertFsStoreOrderDf(FsStoreOrderDf fsStoreOrderDf)
     {
+        fsStoreOrderDf.setCreateTime(new Date());
         return baseMapper.insertFsStoreOrderDf(fsStoreOrderDf);
     }
 
     /**
      * 修改订单代服管家
-     * 
+     *
      * @param fsStoreOrderDf 订单代服管家
      * @return 结果
      */
@@ -67,7 +69,7 @@ public class FsStoreOrderDfServiceImpl extends ServiceImpl<FsStoreOrderDfMapper,
 
     /**
      * 批量删除订单代服管家
-     * 
+     *
      * @param orderIds 需要删除的订单代服管家主键
      * @return 结果
      */
@@ -79,7 +81,7 @@ public class FsStoreOrderDfServiceImpl extends ServiceImpl<FsStoreOrderDfMapper,
 
     /**
      * 删除订单代服管家信息
-     * 
+     *
      * @param orderId 订单代服管家主键
      * @return 结果
      */

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -32,10 +32,7 @@ import com.fs.core.config.WxPayProperties;
 import com.fs.core.utils.OrderCodeUtils;
 import com.fs.erp.domain.*;
 import com.fs.erp.dto.*;
-import com.fs.erp.dto.df.BspOrderResponse;
-import com.fs.erp.dto.df.OrderResponse;
-import com.fs.erp.dto.df.RlsDetail;
-import com.fs.erp.dto.df.RlsInfo;
+import com.fs.erp.dto.df.*;
 import com.fs.erp.mapper.FsErpFinishPushMapper;
 import com.fs.erp.service.IErpOrderService;
 import com.fs.event.*;
@@ -3308,6 +3305,13 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         return expressInfoDTO;
     }
 
+    @Override
+    public List<DFConfigVo> getErpAccount() {
+        FsSysConfig sysConfig = configUtil.getSysConfig();
+        String dfConfigVo = sysConfig.getDfAccounts();
+        return JSON.parseArray(dfConfigVo, DFConfigVo.class);
+    }
+
     private IErpOrderService getErpService() {
         FsSysConfig sysConfig = configUtil.getSysConfig();
         Integer erpOpen = sysConfig.getErpOpen();