创建订单优化

wenleiming
1 parent 8bd7c243
Showing 5 changed files with 16 additions and 14 deletions
commons/api/hg/transaction/createAndTrade.py
commons/api/hg/transaction/l_createAndTrade.py
commons/basic/registerRecord_save.py
testcase/hg/tradingOrder/test_createAndTrade.py
testcase/hg/tradingOrder/test_l_createAndTrade.py
@@ -76,8 +76,8 @@ class createAndTrade():
         }
     ]
 }
-
-
+        self.body2 = {"sellerId":141962,"sellerName":"云云康飞卖","sellerAccountId":107663,"sellerCardNo":"888810062816","buyerId":141968,"buyerName":"袁豪正买","buyerCardHolder":"袁豪正买","buyerAccountId":107676,"buyerCardNo":"888810061104","posCode":"111222","tradePassword":"111111","orderItemList":[{"number":0,"batchCode":"2111001098","productId":1247,"productCode":"1600023","productName":"圆茄","categoryId":1600023,"weightType":1,"quantity":100,"pieceWeight":20,"grossWeight":0.0,"tareWeight":0.0,"weight":2000.0,"price":300,"PriceStr":"3.00","amount":30000,"amountStr":"300.00","originId":50000000,"originName":"美属萨摩亚","feeItemList":[{"type":1,"chargeItemId":521,"chargeItemName":"买家手续费","amount":16500.0},{"type":2,"chargeItemId":522,"chargeItemName":"卖家手续费","amount":253.00},{"type":2,"chargeItemId":527,"chargeItemName":"卖家仓储服务费","amount":145.00},{"type":2,"chargeItemId":550,"chargeItemName":"卖家清洁费","amount":200.0}]}]}
+        self.body3 = {"sellerId":141962,"sellerCode":"00131682","sellerName":"云云康飞卖","sellerAccountId":107663,"sellerCardNo":"888810062816","buyerId":141968,"buyerCode":"00131670","buyerName":"袁豪正买","buyerCardHolder":"袁豪正买","buyerAccountId":107676,"buyerCardNo":"888810061104","posCode":"111222","tradePassword":"111111","orderSource":2,"orderItemList":[{"number":0,"batchCode":"2111001093","productId":1247,"productCode":"1600023","productName":"圆茄","categoryId":1600023,"weightType":1,"quantity":100,"pieceWeight":20,"grossWeight":None,"tareWeight":None,"weight":2000.0,"price":200,"PriceStr":"2.00","amount":20000,"amountStr":"200.00","originId":50000000,"originName":"美属萨摩亚","areaId":274,"areaName":"东区01","feeItemList":[{"type":1,"chargeItemId":521,"chargeItemName":"买家手续费","amount":11000.0,"number":"0"},{"type":2,"chargeItemId":522,"chargeItemName":"卖家手续费","amount":253.00,"number":"0"},{"type":2,"chargeItemId":527,"chargeItemName":"卖家仓储服务费","amount":145.00,"number":"0"},{"type":2,"chargeItemId":550,"chargeItemName":"卖家清洁费","amount":200.0,"number":"0"}]}]}
 # creat = createAndTrade()
 # print(creat.body)
 # re = hg.post(url = creat.url,json = creat.body,headers = creat.header,proxies=hg.myproxies)
@@ -74,9 +74,9 @@ class l_createAndTrade():
                     "amount":231.00
                 }]}]}
-
+        self.body1 = {"sellerId":141969,"sellerCode":"00131671","sellerName":"严安彬卖","sellerAccountId":107677,"sellerCardNo":"888810061102","buyerId":141968,"buyerCode":"00131670","buyerName":"袁豪正买","buyerCardHolder":"袁豪正买","buyerAccountId":107676,"buyerCardNo":"888810061104","posCode":"1995","tradePassword":"111111","orderSource":2,"orderItemList":[{"number":0,"batchCode":"2111001080","productId":1246,"productCode":"1600018","productName":"菠菜","categoryId":1600018,"weightType":1,"quantity":100,"pieceWeight":10,"grossWeight":None,"tareWeight":None,"weight":1000.0,"price":500,"PriceStr":"5.00","amount":50000,"amountStr":"500.00","originId":50000000,"originName":"美属萨摩亚","areaId":274,"areaName":"东区01","feeItemList":[{"type":1,"chargeItemId":521,"chargeItemName":"买家手续费","amount":27500.0,"number":"0"},{"type":2,"chargeItemId":522,"chargeItemName":"卖家手续费","amount":253.00,"number":"0"},{"type":2,"chargeItemId":527,"chargeItemName":"卖家仓储服务费","amount":145.00,"number":"0"},{"type":2,"chargeItemId":550,"chargeItemName":"卖家清洁费","amount":200.0,"number":"0"}]}]}
 # lcat = l_createAndTrade()
-# print(lcat.body)
-# re = hg.post(url = lcat.url,json = lcat.body,headers = lcat.header,proxies=hg.myproxies)
+# print(lcat.body1)
+# re = hg.post(url = lcat.url,json = lcat.body1,headers = lcat.header,proxies=hg.myproxies)
 # print(re.json())
 # print(re.headers)
 \ No newline at end of file
@@ -106,7 +106,8 @@ class registerRecord_save():
                 }
         #大客户有装卸10元和其他费2元
         self.body2={"accountId":107792,"cardNo":"888810026785","customerId":141992,"customerCode":"00131694","customerName":"特朗普vip","fixedphoneNumber":None,"mobilephoneNumber":"16111111112","identityCardAddress":"","identityCardNo":"110101198001012390","identityCardType":"ID","registerDetailDtoList":[{"id":0,"areaId":274,"areaName":"东区01","quantity":1000,"productId":374690,"registerRecordId":0,"remark":None,"weight":1000,"weightType":0,"created":None,"createdById":0,"createdByName":None,"createdByDepartmentId":0,"createdByDepartmentName":None,"registerCertificateList":None,"product":None,"registerCertificateDtoList":None,"productDto":{"id":0,"originId":100000000,"originName":"安提瓜和巴布达","pieceWeight":1,"categoryId":374690,"categoryCode":"374690","categoryName":"苹果","created":None}}],"registerFeeDtoList":[{"id":0,"actualFee":200.0,"receivableFee":1300.0,"discountFee":1100.0,"registerRecordId":0,"payStatus":0,"chargeItemName":"其他收费","chargeType":1,"chargeItemId":518,"registerFeeType":999,"created":None,"createdById":0,"createdByName":None,"settleDate":None,"isBehalf":1,"registerLoadingFeeExtDto":None},{"id":0,"actualFee":1000.0,"receivableFee":1000.0,"discountFee":0.0,"registerRecordId":0,"payStatus":0,"chargeItemName":"装卸费","chargeType":0,"chargeItemId":531,"registerFeeType":1,"created":None,"createdById":0,"createdByName":None,"settleDate":None,"isBehalf":1,"registerLoadingFeeExtDto":{"loadingTeamId":54,"loadingTeam":"大江","loadingFee":850.0,"behalfLoadingFee":150.0}}],"tradePassword":""}
-
-# tt=registerRecord_save()
-# re=hg.post(url=tt.url,headers=tt.header,json=tt.body2,proxies=hg.myproxies)
-# print(str(re.json()))
 \ No newline at end of file
+        self.body3 = {"accountId":107677,"cardNo":"888810061102","customerId":141969,"customerCode":"00131671","customerName":"严安彬卖","fixedphoneNumber":None,"mobilephoneNumber":"18055974406","identityCardAddress":"","identityCardNo":"65010119640812071X","identityCardType":"ID","registerDetailDtoList":[{"id":0,"areaId":274,"areaName":"东区01","quantity":100,"productId":1600018,"registerRecordId":0,"remark":None,"weight":1000,"weightType":0,"created":None,"createdById":0,"createdByName":None,"createdByDepartmentId":0,"createdByDepartmentName":None,"registerCertificateList":None,"product":None,"registerCertificateDtoList":None,"productDto":{"id":0,"originId":50000000,"originName":"美属萨摩亚","pieceWeight":10,"categoryId":1600018,"categoryCode":"1600018","categoryName":"菠菜","created":None}}],"registerFeeDtoList":[{"id":0,"actualFee":2000.0,"receivableFee":2000.0,"discountFee":0.0,"registerRecordId":0,"payStatus":0,"chargeItemName":"其他收费","chargeType":1,"chargeItemId":518,"registerFeeType":999,"created":None,"createdById":0,"createdByName":None,"settleDate":None,"isBehalf":1,"registerLoadingFeeExtDto":None,"originId":0,"originName":"","pieceWeight":0,"categoryId":None,"categoryCode":"","categoryName":""},{"id":0,"actualFee":2000.0,"receivableFee":2000.0,"discountFee":0.0,"registerRecordId":0,"payStatus":0,"chargeItemName":"装卸费","chargeType":0,"chargeItemId":531,"registerFeeType":1,"created":None,"createdById":0,"createdByName":None,"settleDate":None,"isBehalf":1,"registerLoadingFeeExtDto":{"loadingTeamId":57,"loadingTeam":"杭果大队","loadingFee":1780.0,"behalfLoadingFee":220.0,"shareRatio":11.0},"originId":50000000,"originName":"美属萨摩亚","pieceWeight":10,"categoryId":1600018,"categoryCode":"1600018","categoryName":"菠菜"}],"tradePassword":"","holdCertificateName":"严安彬卖","holdCertificateNumber":None}
+        self.body4 = {"accountId":107663,"cardNo":"888810062816","customerId":141962,"customerCode":"00131682","customerName":"云云康飞卖","fixedphoneNumber":None,"mobilephoneNumber":"18010474936","identityCardAddress":"","identityCardNo":"650101196408120576","identityCardType":"ID","registerDetailDtoList":[{"id":0,"areaId":274,"areaName":"东区01","quantity":100,"productId":1600023,"registerRecordId":0,"remark":None,"weight":2000,"weightType":0,"created":None,"createdById":0,"createdByName":None,"createdByDepartmentId":0,"createdByDepartmentName":None,"registerCertificateList":None,"product":None,"registerCertificateDtoList":None,"productDto":{"id":0,"originId":50000000,"originName":"美属萨摩亚","pieceWeight":20,"categoryId":1600023,"categoryCode":"1600023","categoryName":"圆茄","created":None}}],"registerFeeDtoList":[{"id":0,"actualFee":2200.0,"receivableFee":2200.0,"discountFee":0.0,"registerRecordId":0,"payStatus":0,"chargeItemName":"其他收费","chargeType":1,"chargeItemId":518,"registerFeeType":999,"created":None,"createdById":0,"createdByName":None,"settleDate":None,"isBehalf":1,"registerLoadingFeeExtDto":None,"originId":0,"originName":"","pieceWeight":0,"categoryId":None,"categoryCode":"","categoryName":""},{"id":0,"actualFee":2000.0,"receivableFee":2000.0,"discountFee":0.0,"registerRecordId":0,"payStatus":0,"chargeItemName":"装卸费","chargeType":0,"chargeItemId":531,"registerFeeType":1,"created":None,"createdById":0,"createdByName":None,"settleDate":None,"isBehalf":1,"registerLoadingFeeExtDto":{"loadingTeamId":57,"loadingTeam":"杭果大队","loadingFee":1780.0,"behalfLoadingFee":220.0,"shareRatio":11.0},"originId":50000000,"originName":"美属萨摩亚","pieceWeight":20,"categoryId":1600023,"categoryCode":"1600023","categoryName":"圆茄"}],"tradePassword":"","holdCertificateName":"云云康飞卖","holdCertificateNumber":"650101196408120576"}
+tt=registerRecord_save()
+re=hg.post(url=tt.url,headers=tt.header,json=tt.body4)
+print(str(re.json()))
 \ No newline at end of file
@@ -45,11 +45,11 @@ ORDER BY
 	aua.account_id DESC 
 	LIMIT 1
 	''')
-        body2 = r.body.copy()
+        body2 = r.body4.copy()
         body2["accountId"] = str(cls.aaa[0])
         body2["cardNo"] = str(cls.aaa[1])
         body2["customerId"] = str(cls.aaa[2])
-        body2["customerCode"] = str(cls.aaa[3])
+        body2["sellerCode"] = str(cls.aaa[3])
         body2["customerName"] = str(cls.aaa[4])
         body2["identityCardNo"] = str(cls.aaa[5])
         body2["mobilephoneNumber"] = str(cls.aaa[6])
@@ -65,7 +65,7 @@ ORDER BY
     @unittest.case_mark(my.mark())
     def test_createAndTrade_01(self):
         "大客户创建订单"
-        body = creat.body.copy()
+        body = creat.body3.copy()
         body["orderItemList"][0]["batchCode"] = self.batch
         print("创建订单body",body)
         re1 = hg.post(url = creat.url, headers = creat.header, json = body)
@@ -32,7 +32,7 @@ WHERE
 ORDER BY
 	aua.account_id DESC 
 	LIMIT 1''')
-        body2 = r.body.copy()
+        body2 = r.body3.copy()
         body2["accountId"] = str(cls.aaa[0])
         body2["cardNo"] = str(cls.aaa[1])
         body2["customerId"] = str(cls.aaa[2])
@@ -55,7 +55,7 @@ ORDER BY
     @unittest.case_mark(my.mark())
     def test_l_createAndTrade_01(self):
         "普通客户创建订单"
-        body = lcat.body.copy()
+        body = lcat.body1.copy()
         body["orderItemList"][0]["batchCode"] = self.batch
         print("创建订单body",body)
         re1 = hg.post(url = lcat.url, headers = lcat.header, json = body,proxies = my.proxies)
@@ -69,3 +69,4 @@ ORDER BY
 if __name__ == '__main__':
     unittest.main()
+