PayVoucher可能为空

order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java

@@ -71,9 +71,9 @@ public class MallOrderServiceImplTest {
 
     @Test
     public void f1() {
-        mcCafeOrderService.createOrder(JSON.parseObject("{\"channelType\":\"saas\",\"partnerId\":\"1206\",\"appId\":\"wx6816a0b007741702\",\"sessionId\":\"ef7f2839e35e7a4f7d21dd1fc26157a4862698a5\",\"orderType\":1,\"menuType\":\"saas\",\"shopId\":\"1450026\",\"couponCode\":\"\",\"payChannelType\":1,\"reachStoreType\":5,\"takeMealFlag\":\"0\",\"needInvoice\":0,\"orderRemark\":\"\",\"receiveId\":\"\"}", CreateOrderVo.class),
+        mcCafeOrderService.createOrder(JSON.parseObject("{\"channelType\":\"saas\",\"partnerId\":\"1206\",\"appId\":\"wx6816a0b007741702\",\"sessionId\":\"db47c0d7f8238e7495cef5525d91b12befa6ce35\",\"orderType\":1,\"menuType\":\"saas\",\"shopId\":\"1450167\",\"couponCode\":\"\",\"buyMonthlyCard\":1,\"receiveId\":\"\"}", CreateOrderVo.class),
                 new StoreResponse.BizVO(),
-                JSON.parseObject("{\"activityDiscountsDtos\":[{\"activityCode\":\"CZJG2020091815220412683\",\"activityName\":\"terry0918eee\",\"activityType\":23,\"discountAmount\":-2200}],\"deliveryAmount\":0,\"discountDeliveryAmount\":0,\"isDiscountDelivery\":false,\"originalTotalAmount\":7100,\"packageAmount\":0,\"products\":[{\"activityDiscountsDtos\":[{\"activityCode\":\"CZJG2020091815220412683\",\"activityName\":\"terry0918eee\",\"activityType\":23,\"actualActivityGoodsNumber\":1,\"discountAmount\":2200}],\"activityType\":2,\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"categoryName\":\"\",\"classificationId\":\"\",\"classificationName\":\"\",\"customerCode\":\"508120\",\"extraList\":[],\"hasProductCoupon\":false,\"materialList\":[],\"originalPrice\":2300,\"picture\":\"https://picture.sandload.cn/1598681143874.png\",\"productCode\":\"901126\",\"qty\":1,\"skuId\":\"184440231236332839\",\"skuName\":\"红茶拿铁-中杯\",\"spuId\":\"184440231236332839\",\"spuName\":\"红茶拿铁-中杯\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":2200},{\"activityDiscountsDtos\":[],\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"classificationId\":\"\",\"classificationName\":\"\",\"comboProducts\":[{\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"customerCode\":\"2217\",\"extraList\":[],\"hasProductCoupon\":false,\"isFixedProduct\":false,\"materialList\":[],\"originalPrice\":1900,\"parentProductId\":\"184437712179293469\",\"picture\":\"https://picture.sandload.cn/1598675643524.png\",\"productType\":6,\"qty\":2,\"skuId\":\"181574788508098858\",\"skuName\":\"中杯拿铁\",\"spuId\":\"181574788508098858\",\"spuName\":\"中杯拿铁\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":0,\"unit\":\"\",\"weight\":0.0},{\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"customerCode\":\"508134\",\"extraList\":[],\"hasProductCoupon\":false,\"isFixedProduct\":false,\"materialList\":[],\"originalPrice\":2100,\"parentProductId\":\"184437712179293469\",\"picture\":\"https://picture.sandload.cn/1598675940164.png\",\"productType\":6,\"qty\":2,\"skuId\":\"184434761663638803\",\"skuName\":\"经典芝士蛋糕\",\"spuId\":\"184434761663638803\",\"spuName\":\"经典芝士蛋糕\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":3200,\"unit\":\"\",\"weight\":0.0}],\"customerCode\":\"508131\",\"extraList\":[],\"hasProductCoupon\":false,\"materialList\":[],\"originalPrice\":4800,\"picture\":\"https://picture.sandload.cn/1598678713405.png\",\"productCode\":\"508131\",\"productType\":6,\"qty\":2,\"skuId\":\"184437712179293469\",\"skuName\":\"早餐啡常搭\",\"spuId\":\"184437712179293469\",\"spuName\":\"早餐啡常搭\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":0,\"unit\":\"\",\"weight\":0.0}],\"totalAmount\":4900,\"totalDiscountAmount\":2200}", ShoppingCartGoodsDto.class),
+                JSON.parseObject("{\"activityDiscountsDtos\":[],\"deliveryAmount\":0,\"discountDeliveryAmount\":0,\"isDiscountDelivery\":false,\"originalTotalAmount\":500,\"packageAmount\":0,\"payCardFee\":0,\"products\":[{\"activityDiscountsDtos\":[],\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"categoryName\":\"\",\"classificationId\":\"\",\"classificationName\":\"\",\"customerCode\":\"110604\",\"extraList\":[],\"hasProductCoupon\":false,\"materialList\":[{\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"customerCode\":\"100072_2\",\"extraList\":[],\"hasProductCoupon\":false,\"originalPrice\":0,\"productCode\":\"100072_2\",\"qty\":1,\"specialExtra\":[],\"spuId\":\"189906104835159083\",\"spuName\":\"多糖浆\",\"stockLimit\":false,\"tax\":0.0,\"totalDiscountAmount\":0}],\"originalPrice\":0,\"picture\":\"https://picture.sandload.cn/1605493364971.png\",\"productCode\":\"110604\",\"qty\":1,\"skuId\":\"191616363987631633\",\"skuName\":\"4test\",\"specialExtra\":[{\"attributeId\":\"187910205014545213\",\"attributeName\":\"多冰\",\"specialCode\":\"110604_200002_2\"}],\"spuId\":\"191612801712731697\",\"spuName\":\"5test\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":0,\"unit\":\"\",\"weight\":0.0},{\"activityDiscountsDtos\":[],\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"categoryName\":\"套餐\",\"classificationId\":\"\",\"classificationName\":\"\",\"comboProducts\":[{\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"customerCode\":\"110604\",\"extraList\":[],\"hasProductCoupon\":false,\"isFixedProduct\":true,\"materialList\":[{\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"customerCode\":\"100072_2\",\"extraList\":[],\"hasProductCoupon\":false,\"originalPrice\":0,\"productCode\":\"100072_2\",\"qty\":1,\"specialExtra\":[],\"spuId\":\"189906104835159083\",\"stockLimit\":false,\"tax\":0.0,\"totalDiscountAmount\":0}],\"originalPrice\":0,\"parentProductId\":\"191724441979486472\",\"picture\":\"https://picture.sandload.cn/1605493364971.png\",\"productType\":6,\"qty\":1,\"skuId\":\"191616363987631633\",\"skuName\":\"4test\",\"specialExtra\":[{\"attributeId\":\"187994174169235473\",\"attributeName\":\"少冰\",\"specialCode\":\"110604_200002_1_1\"}],\"spuId\":\"191612801712731697\",\"spuName\":\"5test\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":0,\"unit\":\"\",\"weight\":0.0},{\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"customerCode\":\"508664\",\"extraList\":[],\"hasProductCoupon\":false,\"isFixedProduct\":false,\"materialList\":[],\"originalPrice\":500,\"parentProductId\":\"191724441979486472\",\"picture\":\"https://picture.sandload.cn/1604910380410.png\",\"productType\":6,\"qty\":1,\"skuId\":\"191003415228296969\",\"skuName\":\"巴斯克芝士蛋糕\",\"spuName\":\"巴斯克芝士蛋糕\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":0,\"unit\":\"\",\"weight\":0.0}],\"customerCode\":\"121431\",\"extraList\":[],\"hasProductCoupon\":false,\"materialList\":[],\"originalPrice\":0,\"picture\":\"https://picture.sandload.cn/1605605774124.png\",\"productCode\":\"121431\",\"productType\":6,\"qty\":1,\"skuId\":\"191724441979486472\",\"skuName\":\"啡常搭\",\"specialExtra\":[],\"spuId\":\"191724441979486472\",\"spuName\":\"啡常搭\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":0,\"unit\":\"\",\"weight\":0.0}],\"totalAmount\":500,\"totalDiscountAmount\":0}", ShoppingCartGoodsDto.class),
                 new OrderExtendedReq(),
                 OrderClientType.SAAS,"www");
     }