优化所有价格、吨数的计算方式 #21

Merged
liangjinman merged 1 commits from test into master 4 years ago
  1. 1
      000_get_current_datetime.robot
  2. 1
      001_login_get_info/login_customer.robot
  3. 1
      001_login_get_info/login_operate.robot
  4. 1
      001_login_get_info/login_operate_psc.robot
  5. 1
      001_login_get_info/login_supplier.robot
  6. 1
      001_login_get_info/login_supplier_focus.robot
  7. 9
      002_user_register/customer_user_register.robot
  8. 3
      002_user_register/supplier_user_register.robot
  9. 38
      003_enterprise_open_account_customer/printing_packaging_factory_open_account.robot
  10. 1
      004_enterprise_open_account_supplier/supplier_paper_open_account.robot
  11. 1
      005_enterprise_apply_credit/apply_credit_qniao_customer.robot
  12. 1
      006_get_credit/customer_credit_password.robot
  13. 1
      006_get_credit/customer_get_credit.robot
  14. 1
      007_paper_variety_management/paper_brand.robot
  15. 1
      007_paper_variety_management/paper_category.robot
  16. 1
      007_paper_variety_management/paper_manufacturer.robot
  17. 1
      008_market_information/market_information_link.robot
  18. 5
      009_product_manage/product_add_and_list.robot
  19. 1
      010_limited_specialoffer/limited_specialoffer_product.robot
  20. 1
      011_product_price_config/product_price_config_qniao_and_feisuan.robot
  21. 1
      012_product_price_update/product_price_batch_update_purchaseprice.robot
  22. 1
      013_paper_list_and_details/customer_get_paper_list_and_detail.robot
  23. 1
      014_shinpping_address/customer_enterprise_shipping_address.robot
  24. 1
      015_customer_create_order/customer_create_order_credit_payment.robot
  25. 1
      016_enquiry_create_order/customer_enquiry_operate_and_supplier_quoted_price_create_order.robot
  26. 1
      017_order_and_receipt_and_delivery/get_oeder_and_receipt_and_delivery.robot
  27. 1
      018_payable_and_receivable/customer_bill.robot
  28. 1
      018_payable_and_receivable/payable.robot
  29. 1
      018_payable_and_receivable/receivable.robot
  30. 0
      019_capacity_market/__init__.robot
  31. 17
      019_capacity_market/capacity_commodity.robot
  32. 17
      019_capacity_market/capacity_machines.robot
  33. 1
      100_test_data_clear.robot
  34. 1
      __init__.robot

1
000_get_current_datetime.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library DateTime
*** Test Cases ***

1
001_login_get_info/login_customer.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown Run Keyword If Test Failed Fatal Error
Library RequestsLibrary
Library Collections
Library urllib3

1
001_login_get_info/login_operate.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown Run Keyword If Test Failed Fatal Error
Library RequestsLibrary
Library Collections
Library urllib3

1
001_login_get_info/login_operate_psc.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown Run Keyword If Test Failed Fatal Error
Library RequestsLibrary
Library Collections
Library urllib3

1
001_login_get_info/login_supplier.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown Run Keyword If Test Failed Fatal Error
Library RequestsLibrary
Library Collections
Library urllib3

1
001_login_get_info/login_supplier_focus.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown Run Keyword If Test Failed Fatal Error
Library RequestsLibrary
Library Collections
Library urllib3

9
002_user_register/customer_user_register.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown Run Keyword If Test Failed Fatal Error
Library DatabaseLibrary
Library RequestsLibrary
Library Collections
@ -114,7 +115,7 @@ operate_get_user_register_list
operate_get_user_register_search
Create Session yytops ${yytops} headers=${operationbackend_header}
${param} Set Variable createTimeBegin=${current_date}&createTimeEnd=${current_date}&mobile=${customer_account}
${param} Set Variable mobile=${customer_account}
${response} Get On Session yytops /cloud-print-user-center/admin/user/get/user-list params=${param}
Log ${response.status_code}
log ${response.json()}
@ -128,7 +129,7 @@ operate_get_customerclue_list
Log ${response.status_code}
log ${response.json()}
Should Be Equal As Numbers 200 ${response.status_code}
#Should Be Equal As Strings successful ${response.json()["message"]}
Should Be Equal As Strings successful ${response.json()["message"]}
#Should Be Equal As Strings ${customer_account} ${response.json()["data"]["records"][0]["mobile"]}
#Should Be Equal As Strings ${customer_companyname} ${response.json()["data"]["records"][0]["companyName"]}
#Should Be Equal As Numbers ${customer_enterprisetype} ${response.json()["data"]["records"][0]["enterpriseType"]}
@ -142,8 +143,8 @@ operate_get_customerclue_search
${response} Get On Session yytops /cloud-print-user-center/admin/get/customerclue/page params=${param}
Log ${response.status_code}
log ${response.json()}
#Should Be Equal As Numbers 200 ${response.status_code}
#Should Be Equal As Strings successful ${response.json()["message"]}
Should Be Equal As Numbers 200 ${response.status_code}
Should Be Equal As Strings successful ${response.json()["message"]}
#Should Be Equal As Strings ${customer_account} ${response.json()["data"]["records"][0]["mobile"]}
#Should Be Equal As Strings ${customer_companyname} ${response.json()["data"]["records"][0]["companyName"]}
#Should Be Equal As Numbers ${customer_enterprisetype} ${response.json()["data"]["records"][0]["enterpriseType"]}

3
002_user_register/supplier_user_register.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown Run Keyword If Test Failed Fatal Error
Library DatabaseLibrary
Library RequestsLibrary
Library Collections
@ -113,7 +114,7 @@ operate_get_user_register_list
operate_get_user_register_search
Create Session yytops ${yytops} headers=${operationbackend_header}
${param} Set Variable createTimeBegin=${current_date}&createTimeEnd=${current_date}&mobile=${supplier_account}
${param} Set Variable mobile=${supplier_account}
${response} Get On Session yytops /cloud-print-user-center/admin/user/get/user-list params=${param}
Log ${response.status_code}
log ${response.json()}

38
003_enterprise_open_account_customer/printing_packaging_factory_open_account.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library DatabaseLibrary
Library RequestsLibrary
Library Collections
@ -73,10 +74,39 @@ operate_get_printing_packaging_factory_modify_state
log ${response.json()}
Should Be Equal As Numbers 200 ${response.status_code}
Should Be Equal As Strings successful ${response.json()["message"]}
#operate_save_printing_packaging_factory_baseinfo_industrialandcommercial_registration_information
# Disable Warnings
# Create Session uecops ${uecops} headers=${operationbackend_header}
# ${printing_packaging_factory_name} Set Variable autotest_printing_packaging_factory_name
# ${printing_packaging_factory_type} Set Variable 2 #企业类型 1云印客户 2印刷包装厂 3造纸厂 4打包厂 5原纸供应商 6设备供应商 7其他
# ${printing_packaging_factory_shortname} Set Variable autotest_shortname
# ${printing_packaging_factory_uniformsocialcreditcode} Set Variable autotest_91440101MA59F2J10M
# ${printing_packaging_factory_locdetail} Set Variable autotest_printing_packaging_factory_locdetail
# ${printing_packaging_factory_legalpersonname} Set Variable autotest_legalperson
# ${printing_packaging_factory_legalpersonidcardno} Set Variable autotest_legalpersonidcardno
# ${printing_packaging_factory_locprovinceid} Set Variable 440000
# ${printing_packaging_factory_loccityid} Set Variable 440100
# ${printing_packaging_factory_locdistrictid} Set Variable 440106
# ${printing_packaging_factory_locstreetid} Set Variable 440106003
# ${printing_packaging_factory_locprovincename} Set Variable 广东省
# ${printing_packaging_factory_loccityname} Set Variable 广州市
# ${printing_packaging_factory_locdistrictname} Set Variable 天河区
# ${printing_packaging_factory_locstreetname} Set Variable 车陂街道
# ${printing_packaging_factory_legalpersonmobile} Set Variable 13800138000
# ${printing_packaging_factory_businessLicense} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg
# ${printing_packaging_factory_legalPersonIdCardBack} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg
# ${printing_packaging_factory_legalPersonIdCardFront} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg
# ${body} Set Variable {"id":"${printing_packaging_factory_id}","enterpriseId":"${printing_packaging_factory_id}","status":0,"legalPersonIdCardFrontImg":"${printing_packaging_factory_legalPersonIdCardFront}","legalPersonIdCardFrontImgs":["${printing_packaging_factory_legalPersonIdCardFront}"],"legalPersonIdCardBackImg":"${printing_packaging_factory_legalPersonIdCardBack}","legalPersonIdCardBackImgs":["${printing_packaging_factory_legalPersonIdCardBack}"],"businessLicenseImg":"${printing_packaging_factory_businessLicense}","businessLicenseImgs":["${printing_packaging_factory_businessLicense}"],"legalPersonMobile":"${printing_packaging_factory_legalpersonmobile}","registeredCapital":999,"name":"${printing_packaging_factory_name}","type":${printing_packaging_factory_type},"shortName":"${printing_packaging_factory_shortname}","uniformSocialCreditCode":"${printing_packaging_factory_uniformsocialcreditcode}","locDetail":"${printing_packaging_factory_locdetail}","legalPersonName":"${printing_packaging_factory_legalpersonname}","legalPersonIdCardNo":"${printing_packaging_factory_legalpersonidcardno}","locProvinceId":${printing_packaging_factory_locprovinceid},"locCityId":${printing_packaging_factory_loccityid},"locDistrictId":${printing_packaging_factory_locdistrictid},"locStreetId":${printing_packaging_factory_locstreetid},"locProvinceName":"${printing_packaging_factory_locprovincename}","locCityName":"${printing_packaging_factory_loccityname}","locDistrictName":"${printing_packaging_factory_locdistrictname}","locStreetName":"${printing_packaging_factory_locstreetname}"}
# ${response} POST On Session uecops /uec/admin/save/enterprise2 ${body.encode("utf8")}
# Log ${response.status_code}
# log ${response.json()}
# Should Be Equal As Numbers 200 ${response.status_code}
# Should Be Equal As Strings successful ${response.json()["message"]}
# sleep 1
operate_save_printing_packaging_factory_baseinfo_industrialandcommercial_registration_information
operate_save_printing_packaging_factory_base_info
Disable Warnings
Create Session uecops ${uecops} headers=${operationbackend_header}
Create Session yytops ${yytops} headers=${operationbackend_header}
${printing_packaging_factory_name} Set Variable autotest_printing_packaging_factory_name
${printing_packaging_factory_type} Set Variable 2 #企业类型 1云印客户 2印刷包装厂 3造纸厂 4打包厂 5原纸供应商 6设备供应商 7其他
${printing_packaging_factory_shortname} Set Variable autotest_shortname
@ -96,8 +126,8 @@ operate_save_printing_packaging_factory_baseinfo_industrialandcommercial_registr
${printing_packaging_factory_businessLicense} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg
${printing_packaging_factory_legalPersonIdCardBack} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg
${printing_packaging_factory_legalPersonIdCardFront} Set Variable https://qncloudprintfiletest.oss-cn-shenzhen.aliyuncs.com/cloudprint/1632378545847.jpg
${body} Set Variable {"id":"${printing_packaging_factory_id}","enterpriseId":"${printing_packaging_factory_id}","status":0,"legalPersonIdCardFrontImg":"${printing_packaging_factory_legalPersonIdCardFront}","legalPersonIdCardFrontImgs":["${printing_packaging_factory_legalPersonIdCardFront}"],"legalPersonIdCardBackImg":"${printing_packaging_factory_legalPersonIdCardBack}","legalPersonIdCardBackImgs":["${printing_packaging_factory_legalPersonIdCardBack}"],"businessLicenseImg":"${printing_packaging_factory_businessLicense}","businessLicenseImgs":["${printing_packaging_factory_businessLicense}"],"legalPersonMobile":"${printing_packaging_factory_legalpersonmobile}","registeredCapital":999,"name":"${printing_packaging_factory_name}","type":${printing_packaging_factory_type},"shortName":"${printing_packaging_factory_shortname}","uniformSocialCreditCode":"${printing_packaging_factory_uniformsocialcreditcode}","locDetail":"${printing_packaging_factory_locdetail}","legalPersonName":"${printing_packaging_factory_legalpersonname}","legalPersonIdCardNo":"${printing_packaging_factory_legalpersonidcardno}","locProvinceId":${printing_packaging_factory_locprovinceid},"locCityId":${printing_packaging_factory_loccityid},"locDistrictId":${printing_packaging_factory_locdistrictid},"locStreetId":${printing_packaging_factory_locstreetid},"locProvinceName":"${printing_packaging_factory_locprovincename}","locCityName":"${printing_packaging_factory_loccityname}","locDistrictName":"${printing_packaging_factory_locdistrictname}","locStreetName":"${printing_packaging_factory_locstreetname}"}
${response} POST On Session uecops /uec/admin/save/enterprise2 ${body.encode("utf8")}
${body} Set Variable {"enterpriseId":"${printing_packaging_factory_id}","id":"${printing_packaging_factory_id}","createTime":"${current_date_second}","updateTime":"${current_date_second}","name":"${printing_packaging_factory_name}","uniformSocialCreditCode":"${printing_packaging_factory_uniformsocialcreditcode}","locProvinceId":${printing_packaging_factory_locprovinceid},"locProvinceName":"${printing_packaging_factory_locprovincename}","locCityId":${printing_packaging_factory_loccityid},"locCityName":"${printing_packaging_factory_loccityname}","locDistrictId":${printing_packaging_factory_locdistrictid},"locDistrictName":"${printing_packaging_factory_locdistrictname}","locStreetId":${printing_packaging_factory_locstreetid},"locStreetName":"${printing_packaging_factory_locstreetname}","locDetail":"${printing_packaging_factory_locdetail}","legalPersonName":"${printing_packaging_factory_legalpersonname}","legalPersonIdCardNo":"${printing_packaging_factory_legalpersonidcardno}","legalPersonMobile":"${printing_packaging_factory_legalpersonmobile}","type":${printing_packaging_factory_type},"shortName":"${printing_packaging_factory_shortname}","registeredCapital":999,"incomeInPastTwoYears":100,"regAddrLongitude":null,"regAddrLatitude":null,"birthday":"${current_date}","cooperationTime":"${current_date_month}","legalPersonIdCardFrontImg":"${printing_packaging_factory_legalPersonIdCardFront}","legalPersonIdCardBackImg":null,"businessLicenseImg":"${printing_packaging_factory_businessLicense}"}
${response} POST On Session yytops /cloud-print-user-center/admin/save/packaging-printing-mill/base-info ${body.encode("utf8")}
Log ${response.status_code}
log ${response.json()}
Should Be Equal As Numbers 200 ${response.status_code}

1
004_enterprise_open_account_supplier/supplier_paper_open_account.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library DatabaseLibrary
Library RequestsLibrary
Library Collections

1
005_enterprise_apply_credit/apply_credit_qniao_customer.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

1
006_get_credit/customer_credit_password.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

1
006_get_credit/customer_get_credit.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

1
007_paper_variety_management/paper_brand.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

1
007_paper_variety_management/paper_category.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library DatabaseLibrary
Library RequestsLibrary
Library Collections

1
007_paper_variety_management/paper_manufacturer.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

1
008_market_information/market_information_link.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

5
009_product_manage/product_add_and_list.robot

@ -1,10 +1,11 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3
*** Variables ***
&{cloudfactory_supplierfocus_header} Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847956666 Authorization=${getlogintoken_supplier_focus}
&{cloudfactory_supplierfocus_header} Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847953922 Authorization=${getlogintoken_supplier_focus}
${yytclient} https://api-client-yyt-test.qniao.cn
*** Test Cases ***
@ -47,7 +48,7 @@ supplierfocus_get_product_list
supplierfocus_get_product_list_search
Create Session yytclient ${yytclient} headers=${cloudfactory_supplierfocus_header}
${product_status} Set Variable 30112 #商品状态 30110未上架 30111上架中 30112已下架
${param} Set Variable salesEnterpriseId=${supplier_paper_id}&status=${product_status}&name=${paper_name}
${param} Set Variable salesEnterpriseId=${supplier_paper_id}&name=${paper_name}
${response} Get On Session yytclient /trading-center/get/seller/query-product-list params-${param}
Log ${response.status_code}
log ${response.json()}

1
010_limited_specialoffer/limited_specialoffer_product.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library DatabaseLibrary
Library RequestsLibrary
Library Collections

1
011_product_price_config/product_price_config_qniao_and_feisuan.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

1
012_product_price_update/product_price_batch_update_purchaseprice.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

1
013_paper_list_and_details/customer_get_paper_list_and_detail.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

1
014_shinpping_address/customer_enterprise_shipping_address.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

1
015_customer_create_order/customer_create_order_credit_payment.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

1
016_enquiry_create_order/customer_enquiry_operate_and_supplier_quoted_price_create_order.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

1
017_order_and_receipt_and_delivery/get_oeder_and_receipt_and_delivery.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

1
018_payable_and_receivable/customer_bill.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

1
018_payable_and_receivable/payable.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

1
018_payable_and_receivable/receivable.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3

0
019_capacity_market/__init__.robot

17
019_capacity_market/capacity_commodity.robot

@ -0,0 +1,17 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3
*** Variables ***
&{cloudfactory_customer_header} Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847965388 Authorization=${getlogintoken_customer}
${yytclient} https://api-client-yyt-test.qniao.cn
*** Test Cases ***
customer_get_capacity_commodity_list
Create Session yytclient ${yytclient} headers=${cloudfactory_customer_header}
${response} Get On Session yytclient /capacity-market/get/capacity-commodity-page
log ${response.json()}
Should Be Equal As Numbers 200 ${response.status_code}
Should Be Equal As Strings successful ${response.json()["message"]}

17
019_capacity_market/capacity_machines.robot

@ -0,0 +1,17 @@
*** Settings ***
Test Teardown
Library RequestsLibrary
Library Collections
Library urllib3
*** Variables ***
&{cloudfactory_customer_header} Content-Type=application/json;charset=UTF-8 X-APP-ID=503258978847965388 Authorization=${getlogintoken_customer}
${yytclient} https://api-client-yyt-test.qniao.cn
*** Test Cases ***
customer_get_machines_list
Create Session yytclient ${yytclient} headers=${cloudfactory_customer_header}
${response} Get On Session yytclient /capacity-market/get/my-machines-list
log ${response.json()}
Should Be Equal As Numbers 200 ${response.status_code}
Should Be Equal As Strings successful ${response.json()["message"]}

1
100_test_data_clear.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown
Library DatabaseLibrary
Library RequestsLibrary
Library Collections

1
__init__.robot

@ -1,4 +1,5 @@
*** Settings ***
Test Teardown Run Keyword If Test Failed Fatal Error
Library DatabaseLibrary
Library RequestsLibrary
Library Collections

Loading…
Cancel
Save