erp

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

@@ -92,17 +92,17 @@ public class HzOMSErpApiController {
      *
      * @param appkey
      * @param timestamp
-     * @param datapackage
+     * @param datapakege
      * @param sign
      * @return
      */
     @PostMapping("/ptorder/logisticsAdd")
-    public HzOMSErpResponseVO logisticsAdd(String appkey, String timestamp, String datapackage, String sign) {
+    public HzOMSErpResponseVO logisticsAdd(String appkey, String timestamp, String datapakege, String sign) {
         HzOMSErpApiParam param = new HzOMSErpApiParam();
         param.setAppkey(appkey);
         param.setSign(sign);
         param.setTimestamp(timestamp);
-        param.setDatapakege(datapackage);
+        param.setDatapakege(datapakege);
         return  hzOMSErpApiService.logisticsAdd(param);
     }
 

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

@@ -1090,7 +1090,7 @@ public interface FsStoreOrderMapper
     @Select(" select * from fs_store_order where order_code=#{orderCode}")
     FsStoreOrder getOrderByOrderCodeAndStoreId(@Param("orderCode")String orderCode);
 
-    @Update("UPDATE fs_store_order SET delivery_code = #{order.deliveryCode} , delivery_name = #{order.deliveryName} , delivery_sn = #{order.deliverySn}   WHERE follow_doctor_id = #{order.orderId}")
+    @Update("UPDATE fs_store_order SET delivery_code = #{order.deliveryCode} , delivery_name = #{order.deliveryName} , delivery_sn = #{order.deliverySn}   WHERE order_id = #{order.orderId}")
     int updateStoreOrderDeliveryInfo(@Param("order") FsStoreOrder order);
 
     @Select("select * from fs_store_order where extend_order_id=#{extendOrderId}")

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

@@ -191,6 +191,7 @@ public class HzOMSErpApiServiceImpl implements ErpApiService {
         res.setMessage("平台订单物流信息回传成功");
         HzOMSErpResponseDetailVO resData = new HzOMSErpResponseDetailVO();
         resData.setErrorlist(errorlist);
+        res.setData(resData);
         return res;
     }