代服

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

@@ -526,7 +526,14 @@ public class FsStoreOrderController extends BaseController
         orderIds.forEach(orderId->{
             try {
                 df.setOrderId(orderId);
-                fsStoreOrderDfService.insertFsStoreOrderDf(df);
+                FsStoreOrderDf temp = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(df.getOrderId());
+                if (temp != null){
+                    df.setUpdateTime(new Date());
+                    fsStoreOrderDfService.updateFsStoreOrderDf(df);
+                } else {
+                    fsStoreOrderDfService.insertFsStoreOrderDf(df);
+                }
+
                 fsStoreOrderService.createOmsOrder(orderId);
             } catch (ParseException e) {
                 throw new RuntimeException(e);
@@ -547,6 +554,7 @@ public class FsStoreOrderController extends BaseController
                 df.setAppSecret(erpAccount.getDfAppsecret());
                 df.setLoginAccount(loginAccount);
                 df.setMonthlyCard(erpAccount.getMonthlyCard());
+                df.setExpressProductCode(erpAccount.getExpressProductCode());
                 df.setStatus(0);
                 break;
             }

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

@@ -2,26 +2,23 @@ package com.fs.his.controller;
 
 
 import com.fs.common.core.domain.R;
-import com.fs.erp.domain.ErpOrder;
-import com.fs.erp.dto.ErpOrderResponse;
-import com.fs.erp.dto.df.BspOrderResponse;
-import com.fs.erp.dto.sdk.HzOMS.utils.HzOMSUtils;
+import com.fs.common.utils.StringUtils;
 import com.fs.erp.service.IErpOrderService;
-import com.fs.his.domain.FsStoreOrder;
-import com.fs.his.domain.FsVessel;
 import com.fs.his.param.HzOMSErpApiParam;
 import com.fs.his.service.ErpApiService;
 import com.fs.his.service.IFsStoreOrderService;
-import com.fs.his.service.impl.FsStoreOrderServiceImpl;
 import com.fs.his.vo.HzOMSErpResponseVO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 /**
  * 瀚智OMS Erp系统推送平数据接口
@@ -29,6 +26,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/erp/call")
+@Slf4j
 public class HzOMSErpApiController {
 
     @Autowired
@@ -132,8 +130,43 @@ public class HzOMSErpApiController {
      * 代服管家订单回调
      */
     @PostMapping("/dfNotifyUrl")
-    public R dfOrderResult(@RequestBody BspOrderResponse param)
-    {
-        return fsStoreOrderService.dfOrderResult(param);
+    public R dfOrderResult(HttpServletRequest request){
+        String body = null;
+        try {
+            // 1. 先设置编码
+            request.setCharacterEncoding("UTF-8");
+            // 3. 按 UTF-8 解码
+            body = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            log.error("读取 body 失败", e);
+            return null;
+        }
+        log.info("Body UTF-8: {}", body);
+
+        return StringUtils.isNotBlank(body)
+                ? fsStoreOrderService.dfOrderResult(body)
+                : R.ok();
+    }
+
+    /**
+     * 代服管家订单状态回调
+     */
+    @PostMapping("/receiveWaybillPush")
+    public R receiveWaybillPush(HttpServletRequest request) {
+        String body = null;
+        try {
+            // 1. 先设置编码
+            request.setCharacterEncoding("UTF-8");
+            // 3. 按 UTF-8 解码
+            body = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            log.error("读取 body 失败", e);
+            return null;
+        }
+        log.info("Body UTF-8: {}", body);
+
+        return StringUtils.isNotBlank(body)
+                ? fsStoreOrderService.receiveWaybillPush(body)
+                : R.ok();
     }
 }

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -302,6 +302,21 @@ public class Task {
 
     }
 
+
+    public void getOrderDeliveryStatus()
+    {
+        IErpOrderService erpOrderService = getErpService();
+        List<FsStoreOrder> orders = null;
+        if (erpOrderService !=null && erpOrderService == dfOrderService){
+            orders = fsStoreOrderMapper.selectShippedOrder();
+            if(orders!=null&& !orders.isEmpty()){
+                for(FsStoreOrder order:orders){
+                    erpOrderService.getOrderDeliveryStatus(order);
+                }
+            }
+        }
+    }
+
     public void CreateOmsAndHis()
     {
         List<Long> omsList = fsStoreOrderMapper.selectFsStoreOrderNoCreateOms();

fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -510,7 +510,10 @@ public class CompanyServiceImpl implements ICompanyService
                 SysConfig sysConfig = sysConfigMapper.selectConfigByConfigKey("his.store");
                 StoreConfig fsPayConfig = new Gson().fromJson(sysConfig.getConfigValue(), StoreConfig.class);
                 Integer DeductMoneyRate = fsPayConfig.getDeductMoneyRate();
-                BigDecimal money = order.getPrescribePrice().multiply(new BigDecimal(DeductMoneyRate).multiply(new BigDecimal("0.01")));
+                BigDecimal money = BigDecimal.ZERO;
+                if (DeductMoneyRate != null && DeductMoneyRate > 0) {
+                    money = order.getPrescribePrice().multiply(new BigDecimal(DeductMoneyRate).multiply(new BigDecimal("0.01")));
+                }
                 logger.info("扣除成本:"+order.getOrderCode()+":"+money);
                 company.setMoney(company.getMoney().subtract(money));
                 companyMapper.updateCompany(company);

fs-service/src/main/java/com/fs/erp/dto/df/DFCancelOrderResultRequest.java

@@ -0,0 +1,11 @@
+package com.fs.erp.dto.df;
+
+import lombok.Data;
+
+@Data
+public class DFCancelOrderResultRequest {
+    private Integer isCancelSuss;
+    private String loginAccount;
+    private String mailNumber;
+    private String orderNumber;
+}

fs-service/src/main/java/com/fs/erp/dto/df/DFConfigVo.java

@@ -9,6 +9,7 @@ public class DFConfigVo {
     String loginAccount; //登录账号
     String callBackUrl; //回调地址
     String monthlyCard; //月结账号
+    String expressProductCode; //物流产品编码
     String senderName; //寄件人姓名
     String senderPhone;  //寄件人手机
     String senderProvince;  //寄件人省

fs-service/src/main/java/com/fs/erp/dto/df/DFOrderStatusResultRequest.java

@@ -0,0 +1,11 @@
+package com.fs.erp.dto.df;
+
+import lombok.Data;
+
+@Data
+public class DFOrderStatusResultRequest {
+    private Integer status;
+    private Long acceptTime;
+    private String mailNumber; //运单号
+    private String acceptTimeStr;
+}

fs-service/src/main/java/com/fs/erp/dto/sdk/df/enums/RequestUrlEnum.java

@@ -6,6 +6,7 @@ public enum RequestUrlEnum {
     CREAT_ORDER("order/create", "POST"),
     ORDER_RESULT("query/order", "POST"),
     ORDER_DELIVERY("query/route", "GET"),
+    ORDER_DELIVERY_STATUS("query/waybill", "POST"),
     ORDER_CANCEL("order/cancel", "POST");
 
     private final String url;

fs-service/src/main/java/com/fs/erp/service/IErpOrderService.java

@@ -3,6 +3,7 @@ package com.fs.erp.service;
 import com.fs.erp.domain.ErpOrder;
 import com.fs.erp.domain.ErpRefundOrder;
 import com.fs.erp.dto.*;
+import com.fs.his.domain.FsStoreOrder;
 
 public interface IErpOrderService
 {
@@ -14,5 +15,7 @@ public interface IErpOrderService
     ErpOrderQueryResponse getOrder(ErpOrderQueryRequert param);
     BaseResponse refundUpdate(ErpRefundUpdateRequest param);
     ErpOrderResponse finishOrder(ErpOrder order);
+    //代服管家查物流状态
+    void getOrderDeliveryStatus(FsStoreOrder order);
 }
 

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

@@ -15,16 +15,16 @@ import com.fs.erp.domain.ErpRefundOrder;
 import com.fs.erp.dto.*;
 import com.fs.erp.dto.df.*;
 import com.fs.erp.dto.sdk.df.DfClient;
-import com.fs.erp.dto.sdk.df.enums.ExpressProductCodeEnum;
 import com.fs.erp.dto.sdk.df.enums.RequestUrlEnum;
 import com.fs.erp.service.IErpOrderService;
-import com.fs.erp.utils.CommonUtils;
 import com.fs.his.config.FsSysConfig;
 import com.fs.his.domain.*;
 import com.fs.his.enums.FsStoreOrderLogEnum;
 import com.fs.his.mapper.*;
+import com.fs.his.param.FsStoreOrderSalesParam;
 import com.fs.his.service.IFsExpressService;
 import com.fs.his.service.IFsStoreOrderLogsService;
+import com.fs.his.service.IFsStoreOrderService;
 import com.fs.his.utils.ConfigUtil;
 import com.hc.openapi.tool.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -75,6 +75,8 @@ public class DfOrderServiceImpl implements IErpOrderService
 
     @Autowired
     private IFsExpressService expressService;
+    @Autowired
+    private IFsStoreOrderService fsStoreOrderService;
 
 
     @Override
@@ -205,6 +207,9 @@ public class DfOrderServiceImpl implements IErpOrderService
             if (order != null) {
                 //获取下单账户
                 FsStoreOrderDf df = fsStoreOrderDfMapper.selectFsStoreOrderDfByOrderId(order.getOrderId());
+                if(df == null){
+                    return null;
+                }
                 Integer sfAccountIndex = getSFAccountIndex(order.getOrderId());
                 if (sfAccountIndex > -1) {
                     Map<String, Object> orderResultQueryParam = new HashMap<>();
@@ -233,6 +238,64 @@ public class DfOrderServiceImpl implements IErpOrderService
         return null;
     }
 
+    @Override
+    public void getOrderDeliveryStatus(FsStoreOrder order) {
+        Map<String, Object> map = new HashMap<>();
+        Integer sfAccountIndex = getSFAccountIndex(order.getOrderId());
+        map.put("orderNumber", order.getOrderCode());
+        map.put("mailNumber", order.getDeliverySn());
+        try {
+            String response = client.execute(RequestUrlEnum.ORDER_DELIVERY_STATUS, map, sfAccountIndex);
+            DFApiResponse dfApiResponse = JSON.parseObject(response, DFApiResponse.class);
+            if ("运单不存在".equals(dfApiResponse.getMsg())){
+                //取消订单
+                FsStoreOrderSalesParam afterSalesParam = new FsStoreOrderSalesParam();
+                afterSalesParam.setOrderId(order.getOrderId());
+                afterSalesParam.setReasons("代服管家取消订单");
+                afterSalesParam.setOperator("代服管家");
+                fsStoreOrderService.afterSales(afterSalesParam);
+                FsStoreOrderDf df = new FsStoreOrderDf();
+                df.setOrderId(order.getOrderId());
+                df.setStatus(2);
+                df.setUpdateTime(new Date());
+                fsStoreOrderDfMapper.updateFsStoreOrderDf(df);
+                log.info("代服管家 订单取消成功: {}", response);
+            }
+            //3.处理请求结果
+            if (dfApiResponse != null && "ok".equals(dfApiResponse.getCode())) {
+                String jsonString = JSON.toJSONString(dfApiResponse.getResult());
+                List<DFOrderStatusResultRequest> requestList = JSON.parseArray(jsonString, DFOrderStatusResultRequest.class);
+                if (requestList != null && !requestList.isEmpty()){
+                    //0待揽收 1已揽收 2运输中 3派送中 4异常件 5退回件 6退回签收 7转寄件 8作废件 9已签收 10 已取消
+                    for (DFOrderStatusResultRequest temp : requestList) {
+                        if (temp.getStatus() == 10){
+                            //取消订单
+                            String mailNumber = temp.getMailNumber();
+                            List<FsStoreOrder> fsStoreOrders = fsStoreOrderMapper.selectFsStoreOrderListByDeliverySn(mailNumber);
+                            if (fsStoreOrders != null && !fsStoreOrders.isEmpty()){
+                                fsStoreOrders.forEach(tempOrder -> {
+                                    FsStoreOrderSalesParam afterSalesParam = new FsStoreOrderSalesParam();
+                                    afterSalesParam.setOrderId(tempOrder.getOrderId());
+                                    afterSalesParam.setReasons("代服管家取消订单");
+                                    afterSalesParam.setOperator("代服管家");
+                                    fsStoreOrderService.afterSales(afterSalesParam);
+                                    FsStoreOrderDf df = new FsStoreOrderDf();
+                                    df.setOrderId(order.getOrderId());
+                                    df.setStatus(2);
+                                    df.setUpdateTime(new Date());
+                                    fsStoreOrderDfMapper.updateFsStoreOrderDf(df);
+                                    log.info("代服管家 订单取消成功: {}", response);
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
     /**
      * 获取erp推送参数
      *
@@ -266,11 +329,11 @@ public class DfOrderServiceImpl implements IErpOrderService
                 Map<String, Object> orderResultQueryParam = new HashMap<>();
                 orderResultQueryParam.put("orderNumber", order.getPlatform_code());
                 orderResultQueryParam.put("exInterfaceType", df.getStatus());
-//                try {
-//                    getOrderResult(orderResultQueryParam,sfAccountIndex);
-//                } catch (Exception e) {
-//
-//                }
+                try {
+                    getOrderResult(orderResultQueryParam,sfAccountIndex);
+                } catch (Exception e) {
+                    log.info("推送订单完成，查询订单问题{}", e.getMessage());
+                }
                 ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
                 erpOrderResponse.setCode(order.getPlatform_code());
                 erpOrderResponse.setSuccess(true);
@@ -293,6 +356,7 @@ public class DfOrderServiceImpl implements IErpOrderService
         df.setAppSecret(config.getDfAppsecret());
         df.setLoginAccount(config.getLoginAccount());
         df.setMonthlyCard(config.getMonthlyCard());
+        df.setExpressProductCode(config.getExpressProductCode());
         df.setTotalPrice(fsStoreOrder.getPayMoney());
         df.setPlatformPrice(fsStoreOrder.getPayPrice());
         df.setStatus(1);
@@ -323,6 +387,7 @@ public class DfOrderServiceImpl implements IErpOrderService
         }
         String loginAccount = config.getLoginAccount();
         vo.setMonthlyCard(config.getMonthlyCard()); //月结卡号
+        vo.setExpressProductCode(config.getExpressProductCode()); //物流产品编码
 
 
         vo.setLoginAccount(loginAccount); //代服系统登录账号
@@ -345,11 +410,11 @@ public class DfOrderServiceImpl implements IErpOrderService
             orderPayMethod = 2;
             // 货到付款金额 = 物流代收金额-优惠金额
             vo.setCollectingMoney(fsStoreOrder.getPayDelivery().subtract(couponPrice).doubleValue());
+            vo.setCollectionCardNumber(config.getMonthlyCard()); // 就是月结账号
         }
         //订单付款方式 1:在线支付 2:货到付款
         //如果填了2，代收金额必须大于0，代收卡号必填
         vo.setOrderPayMethod(orderPayMethod);
-        vo.setExpressProductCode(ExpressProductCodeEnum.LAND.getValue()); //物流产品编码 默认陆运包裹
 
         vo.setConsignmentNumber(Integer.valueOf(Math.toIntExact(fsStoreOrder.getTotalNum()))); //托寄物数量 必填
 

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

@@ -9,6 +9,7 @@ import com.fs.erp.dto.*;
 import com.fs.erp.service.IErpOrderService;
 import com.fs.erp.utils.CommonUtils;
 import com.fs.his.config.FsSysConfig;
+import com.fs.his.domain.FsStoreOrder;
 import com.fs.his.utils.ConfigUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -132,4 +133,9 @@ public class ErpOrderServiceImpl implements IErpOrderService
     public ErpOrderResponse finishOrder(ErpOrder order) {
         return null;
     }
+
+    @Override
+    public void getOrderDeliveryStatus(FsStoreOrder order) {
+
+    }
 }

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

@@ -151,6 +151,11 @@ public class HzOMSErpOrderServiceImpl implements IErpOrderService {
         return null;
     }
 
+    @Override
+    public void getOrderDeliveryStatus(FsStoreOrder order) {
+
+    }
+
     /**
      * 构建瀚智创建订单参数
      *

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

@@ -883,6 +883,11 @@ public class WdtErpOrderServiceImpl implements IErpOrderService {
         return new ErpOrderResponse();
     }
 
+    @Override
+    public void getOrderDeliveryStatus(FsStoreOrder order) {
+
+    }
+
     public static String convertToSnakeCase(Object obj) {
         SerializeConfig config = new SerializeConfig();
         config.propertyNamingStrategy = PropertyNamingStrategy.SnakeCase;

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

@@ -38,6 +38,10 @@ public class FsStoreOrderDf extends BaseEntity{
     @Excel(name = "顺丰月结账户")
     private String monthlyCard;
 
+    /** 顺丰月结账户 */
+    @Excel(name = "顺丰月结账户")
+    private String expressProductCode;
+
     /** 订单总价 */
     @Excel(name = "订单总价")
     private BigDecimal totalPrice;

fs-service/src/main/java/com/fs/his/mapper/FsStoreOrderMapper.java

@@ -1094,4 +1094,7 @@ public interface FsStoreOrderMapper
     int updateStoreOrderDeliveryInfo(@Param("order") FsStoreOrder order);
     @Update("UPDATE fs_store_order SET delivery_code = #{deliveryCode} WHERE extend_order_id = #{extendOrderId}")
     int updateFsStoreOrderByExtendOrderId(@Param("extendOrderId")String extendOrderId,@Param("deliveryCode")String deliveryCode);
+
+    @Select("select * from fs_store_order where  `status`=3 and extend_order_id is not null and delivery_sn is not null")
+    List<FsStoreOrder> selectShippedOrder();
 }

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

@@ -226,7 +226,7 @@ public interface IFsStoreOrderService
 
     int updateStoreOrderDeliveryInfo(FsStoreOrder order);
 
-    R dfOrderResult(BspOrderResponse param);
+    R dfOrderResult(String body);
 
     R syncDfExpress(Long id);
 
@@ -238,4 +238,11 @@ public interface IFsStoreOrderService
     ExpressInfoDTO getDfExpressInfoDTO(FsStoreOrder order);
 
     List<DFConfigVo> getErpAccount();
+
+    /**
+     * 代服订单状态推送
+     * @param body
+     * @return
+     */
+    R receiveWaybillPush(String body);
 }

fs-service/src/main/resources/mapper/his/FsStoreOrderDfMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="appSecret"    column="app_secret"    />
         <result property="loginAccount"    column="login_account"    />
         <result property="monthlyCard"    column="monthly_card"    />
+        <result property="expressProductCode"    column="express_product_code"    />
         <result property="totalPrice"    column="total_price"    />
         <result property="platformPrice"    column="platform_price"    />
         <result property="status"    column="status"    />
@@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsStoreOrderDfVo">
-        select order_id, order_code, app_key, app_secret, login_account, monthly_card, total_price, platform_price, status, create_time, update_time from fs_store_order_df
+        select order_id, order_code, app_key, app_secret, login_account, monthly_card, express_product_code,total_price, platform_price, status, create_time, update_time from fs_store_order_df
     </sql>
 
     <select id="selectFsStoreOrderDfList" parameterType="FsStoreOrderDf" resultMap="FsStoreOrderDfResult">
@@ -30,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appSecret != null  and appSecret != ''"> and app_secret = #{appSecret}</if>
             <if test="loginAccount != null  and loginAccount != ''"> and login_account = #{loginAccount}</if>
             <if test="monthlyCard != null  and monthlyCard != ''"> and monthly_card = #{monthlyCard}</if>
+            <if test="expressProductCode != null  and expressProductCode != ''"> and express_product_code = #{expressProductCode}</if>
             <if test="totalPrice != null "> and total_price = #{totalPrice}</if>
             <if test="platformPrice != null "> and platform_price = #{platformPrice}</if>
             <if test="status != null "> and status = #{status}</if>
@@ -50,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appSecret != null and appSecret != ''">app_secret,</if>
             <if test="loginAccount != null and loginAccount != ''">login_account,</if>
             <if test="monthlyCard != null and monthlyCard != ''">monthly_card,</if>
+            <if test="expressProductCode != null and expressProductCode != ''">express_product_code,</if>
             <if test="totalPrice != null">total_price,</if>
             <if test="platformPrice != null">platform_price,</if>
             <if test="status != null">status,</if>
@@ -63,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appSecret != null and appSecret != ''">#{appSecret},</if>
             <if test="loginAccount != null and loginAccount != ''">#{loginAccount},</if>
             <if test="monthlyCard != null and monthlyCard != ''">#{monthlyCard},</if>
+            <if test="expressProductCode != null and expressProductCode != ''">#{expressProductCode},</if>
             <if test="totalPrice != null">#{totalPrice},</if>
             <if test="platformPrice != null">#{platformPrice},</if>
             <if test="status != null">#{status},</if>
@@ -79,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appSecret != null and appSecret != ''">app_secret = #{appSecret},</if>
             <if test="loginAccount != null and loginAccount != ''">login_account = #{loginAccount},</if>
             <if test="monthlyCard != null and monthlyCard != ''">monthly_card = #{monthlyCard},</if>
+            <if test="expressProductCode != null and expressProductCode != ''">express_product_code = #{expressProductCode},</if>
             <if test="totalPrice != null">total_price = #{totalPrice},</if>
             <if test="platformPrice != null">platform_price = #{platformPrice},</if>
             <if test="status != null">status = #{status},</if>