erp

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

@@ -90,6 +90,11 @@ public class FsStoreOrderController extends BaseController
     @Qualifier("wdtErpOrderServiceImpl")
     private IErpOrderService wdtOrderService;
 
+
+    @Autowired
+    @Qualifier("hzOMSErpOrderServiceImpl")
+    private IErpOrderService hdtOrderService;
+
     @Autowired
     SysConfigMapper sysConfigMapper;
     /**
@@ -369,6 +374,9 @@ public class FsStoreOrderController extends BaseController
                 } else if (erpType == 2){
                     //旺店通
                     erpOrderService =  wdtOrderService;
+                } else if (erpType == 3){
+                    //旺店通
+                    erpOrderService =  hdtOrderService;
                 }
                 return erpOrderService;
 

fs-company/src/main/java/com/fs/company/controller/store/FsStoreOrderController.java

@@ -527,6 +527,10 @@ public class FsStoreOrderController extends BaseController
     @Autowired
     @Qualifier("wdtErpOrderServiceImpl")
     private IErpOrderService wdtOrderService;
+
+    @Autowired
+    @Qualifier("hzOMSErpOrderServiceImpl")
+    private IErpOrderService hzOMSErpOrderService;
     private IErpOrderService getErpService() {
         FsSysConfig sysConfig = configUtil.getSysConfig();
         Integer erpOpen = sysConfig.getErpOpen();
@@ -541,6 +545,9 @@ public class FsStoreOrderController extends BaseController
                 } else if (erpType == 2){
                     //旺店通
                     erpOrderService =  wdtOrderService;
+                }  else if (erpType == 3){
+                    //hzOMs
+                    erpOrderService =  hzOMSErpOrderService;
                 }
                 return erpOrderService;
 

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

@@ -78,7 +78,7 @@ public class HzOMSErpGoodsServiceImpl implements IErpGoodsService {
         //添加上传的商品
         JSONObject goods = new JSONObject();
         //平台商品编码
-        goods.put("cptgoodsid", fsStoreProduct.getProductId());
+        goods.put("cptgoodsid", fsStoreProduct.getBarCode());
         //平台商品名称
         goods.put("cptgoodsname", fsStoreProduct.getProductName());
         //平台商品价格 f
@@ -102,7 +102,7 @@ public class HzOMSErpGoodsServiceImpl implements IErpGoodsService {
             //平台规格名称
             attrObj.put("cptspecname", attr.getSku());
             //平台规格编码
-            attrObj.put("cptspeccode", attr.getId());
+            attrObj.put("cptspeccode", attr.getBarCode());
             //自定义规格编码 f
 //            attrObj.put("ccustid", attr.getAttrName());
             //规格库存

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

@@ -94,7 +94,10 @@ public class HzOMSErpOrderServiceImpl implements IErpOrderService {
 
     @Override
     public ErpOrderQueryResponse getOrder(ErpOrderQueryRequert param) {
-        return null;
+
+        ErpOrderQueryResponse res = fsStoreOrderService.getHzOMSErpOrder(param.getCode());
+
+        return res;
     }
 
     @Override
@@ -279,10 +282,6 @@ public class HzOMSErpOrderServiceImpl implements IErpOrderService {
         for (int i = 0, fsStoreOrderItemsSize = fsStoreOrderItems.size(); i < fsStoreOrderItemsSize; i++) {
             FsStoreOrderItem fsStoreOrderItem = fsStoreOrderItems.get(i);
             JSONObject goodItem = new JSONObject();
-            //商品编码
-            goodItem.put("cptgoodsid", fsStoreOrderItem.getProductId());
-            //商品规格编码
-            goodItem.put("cptspeccode", fsStoreOrderItem.getProductAttrValueId());
 
             FsStoreProduct fsStoreProduct = fsStoreProductService.selectFsStoreProductById(fsStoreOrderItem.getProductId());
             Assert.notNull(fsStoreProduct,String.format("当前产品 %d 没有找到", fsStoreOrderItem.getProductId()));
@@ -295,6 +294,11 @@ public class HzOMSErpOrderServiceImpl implements IErpOrderService {
             } else {
                 fsStoreProductAttrValue.setPrice(fsStoreProduct.getPrice());
             }
+            //商品编码
+            goodItem.put("cptgoodsid",fsStoreProduct.getBarCode());
+            //商品规格编码
+            goodItem.put("cptspeccode", fsStoreProductAttrValue.getBarCode());
+
             //商品名称
             goodItem.put("cgoodsname", fsStoreProduct.getProductName());
             //商品规格名称 f

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

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

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

@@ -10,6 +10,7 @@ import com.fs.company.param.FsStoreStatisticsParam;
 import com.fs.company.vo.FsStoreOrderStatisticsVO;
 import com.fs.company.vo.FsStoreProductStatisticsVO;
 import com.fs.erp.domain.ErpOrder;
+import com.fs.erp.dto.ErpOrderQueryResponse;
 import com.fs.his.domain.*;
 import com.fs.his.dto.ExpressNotifyDTO;
 import com.fs.his.dto.ExpressResultDTO;
@@ -221,4 +222,6 @@ public interface IFsStoreOrderService
     FsStoreOrder getOrderByOrderCodeAndStoreId(String orderCode, Long storeId);
 
     int updateStoreOrderDeliveryInfo(FsStoreOrder order);
+
+    ErpOrderQueryResponse getHzOMSErpOrder(String extendOrderId);
 }

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

@@ -1954,6 +1954,10 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     //旺店通
                     erpOrderService =  wdtOrderService;
                 }
+                else if (erpType == 3){
+                    //旺店通
+                    erpOrderService =  hzOMSOrderService;
+                }
                 ErpOrderQueryResponse response = erpOrderService.getOrder(request);
                 if(response.getOrders()!=null&&response.getOrders().size()>0){
                     for(ErpOrderQuery orderQuery : response.getOrders()){
@@ -3100,4 +3104,59 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         return fsStoreOrderMapper.updateStoreOrderDeliveryInfo(order);
     }
 
+    /**
+     * 获取erp订单 HZOMS mock
+     * @param extendOrderId
+     * @return
+     */
+    @Override
+    public  ErpOrderQueryResponse getHzOMSErpOrder(String extendOrderId){
+
+        ErpOrderQueryResponse result = new ErpOrderQueryResponse();
+        FsStoreOrder fsStoreOrder = fsStoreOrderMapper.selectFsStoreOrderByextendOrderId(extendOrderId);
+
+        List<ErpOrderQuery> list = new ArrayList<>();
+        ErpOrderQuery addItem = new ErpOrderQuery();
+        // 订单号
+        addItem.setCode(fsStoreOrder.getOrderCode());
+        // 商品数量
+        addItem.setQty(fsStoreOrder.getTotalNum().intValue());
+        // 商品金额
+        addItem.setAmount(fsStoreOrder.getTotalPrice().doubleValue());
+        // 支付金额
+        addItem.setPayment(fsStoreOrder.getPayMoney().doubleValue());
+//        addItem.setApprove();
+//        addItem.setCod();
+//        addItem.setCancle();
+//        addItem.setPlatform_code();
+        addItem.setCreatetime(fsStoreOrder.getCreateTime());
+//        addItem.setShop_name();
+//        addItem.setShop_code();
+//        addItem.setWarehouse_name();
+//        addItem.setWarehouse_code();
+        // 快递名称
+        addItem.setExpress_name(fsStoreOrder.getDeliveryName());
+        // 快递编号
+        addItem.setExpress_code(fsStoreOrder.getDeliveryCode());
+        // 收货人
+        addItem.setReceiver_name(fsStoreOrder.getUserName());
+        // 电话
+        addItem.setReceiver_phone(fsStoreOrder.getUserPhone());
+        // 电话
+        addItem.setReceiver_mobile(fsStoreOrder.getUserPhone());
+        //地址
+        addItem.setReceiver_address(fsStoreOrder.getUserAddress());
+        // 订单状态
+        addItem.setDelivery_state(fsStoreOrder.getStatus());
+
+        ErpDeliverys erpDeliverys = new ErpDeliverys();
+        erpDeliverys.setExpress_code(fsStoreOrder.getDeliveryCode());
+        erpDeliverys.setExpress_name(fsStoreOrder.getDeliveryName());
+        erpDeliverys.setMail_no(fsStoreOrder.getDeliveryCode());
+        erpDeliverys.setDelivery(true);
+
+        addItem.setDeliverys(new ArrayList<>(Collections.singletonList(erpDeliverys)));
+        result.setOrders(Collections.singletonList(addItem));
+        return result;
+    }
 }

fs-store/src/main/java/com/fs/store/controller/store/FsStoreOrderController.java

@@ -68,6 +68,9 @@ public class FsStoreOrderController extends BaseController
     @Autowired
     @Qualifier("wdtErpOrderServiceImpl")
     private IErpOrderService wdtOrderService;
+    @Autowired
+    @Qualifier("hzOMSErpOrderServiceImpl")
+    private IErpOrderService hzOMSOrderService;
     /**
      * 查询订单列表
      */
@@ -343,6 +346,9 @@ public class FsStoreOrderController extends BaseController
                 } else if (erpType == 2){
                     //旺店通
                     erpOrderService =  wdtOrderService;
+                } else if (erpType == 3){
+                    //hz
+                    erpOrderService =  hzOMSOrderService;
                 }
                 return erpOrderService;