Skip to content

F
familyMart_takeaway
Commit f4cbd2e1 by wuyang.zou
Options

Family New Feature: 

products[i].specs[j] 数组对象字段:  extraPrice:套餐子商品加价价格;
originalPrice: 套餐子商品原价;

扩展 extendedAttributes 对象字段, 如下: amountMax:剩余活动金额; pointsMultiple:福利分倍数; memberDayPoint:积分会员日积分

Version: 1.2.7-1
parent f0661dae
Showing with 18 additions and 177 deletions
README.md
......@@ -33,3 +33,7 @@ build:编译中间文件<br>
3.5 2021-03-12 wuyang.zou Version: 1.2.6 RC //①新增动态扩展字段: extendedAttributes, 以后新增独立意义的字段时,将不需要再升级程序; ② 支付信息模块，新增 平台服务费 + 履约服务费
3.6 2021-05-12 wuyang.zou Version: 1.2.7 RC //修复Bug: Plugin Connect ODS 服务成功后，Plugin 接受到 Pos登录请求后，转发给 ODS时出现 send Error，Plugin 就进入了 死循环等待 ODS 响应，目前Bug 已经修复。
3.7 2021-07-22 wuyang.zou Version: 1.2.7-1 RC //新增属性字段:
products[i].specs[j] 数组对象字段: extraPrice:套餐子商品加价价格;
originalPrice: 套餐子商品原价; 扩展 extendedAttributes 对象字段, 如下: amountMax:剩余活动金额; pointsMultiple:福利分倍数; memberDayPoint:积分会员日积分
base/CommonStruct.h
......@@ -26,6 +26,8 @@ struct productSpec
int price=0; //规格价格
int qty=0; //规格数量
std::string sku; //规格SKU
int extraPrice = 0; //子商品加价价格
int originalPrice = 0; //子商品原价
};
//商品属性
......@@ -227,6 +229,9 @@ struct orderObj
// extendedAttributes.discountMax 最大折扣额度 单位:分
// extendedAttributes.discountRate 折扣率(10-100)例：10:一折，100:不打折
// extendedAttributes.memberDay 是否是会员日 0:不是 1:是
// extendedAttributes.amountMax 剩余活动金额
// extendedAttributes.pointsMultiple 福利分倍数
// extendedAttributes.memberDayPoint 积分会员日积分
};
//订单状态
......
bin/testOrderJson.json
{
"channel":"207",
"cityId":"",
"delivery":{
"basicPrice":0,
"customerAddress":"上海市闵行区龙茗路2710号",
"customerName":"某",
"customerPhone":"13020144745-413",
"deliveryId":"",
"deliveryTime":"20201224180000",
"distancePrice":0,
"logisticsPhysicalCompany":"",
"name":"",
"phone":"",
"type":"2"
},
"invoice":null,
"offlinePoints":false,
"orderContent":{
"appointmentVO":{
"appointmentTime":"",
"isAppointment":0
},
"createTime":"20201224172736",
"customer":[
{
"accountId":"13020144745-413",
"accountType":"1",
"cardNo":"",
"dyCode":"",
"level":"",
"mobileNo":""
}
],
"deliveryFee":0,
"ecoupons":[
],
"orderCoupons":[
],
"orders":{
"cancelStatus":"",
"deliveryStatus":"",
"deliveryStatusDesc":"",
"id":195035867550581001,
"orderId":"5015398442799490083",
"orderType":"",
"parentId":"",
"pickupCode":"36",
"pickupPoint":"5015398442799490083",
"products":[
{
"attributes":"",
"catgId":"",
"couponQty":0,
"groupIndex":"",
"groupName":"",
"name":"M&M's花生牛奶巧克力",
"originalPrice":580,
"price":580,
"productCode":"",
"productType":"",
"qty":1,
"sku":"20097868",
"source":"",
"specs":[
],
"status":""
},
{
"attributes":"",
"catgId":"",
"couponQty":0,
"groupIndex":"",
"groupName":"",
"name":"M&M's牛奶巧克力",
"originalPrice":580,
"price":580,
"productCode":"",
"productType":"",
"qty":1,
"sku":"20097851",
"source":"",
"specs":[
],
"status":""
},
{
"attributes":"",
"catgId":"",
"couponQty":0,
"groupIndex":"",
"groupName":"",
"name":"包材",
"originalPrice":90,
"price":90,
"productCode":"",
"productType":"",
"qty":1,
"sku":"20823436",
"source":"",
"specs":[
],
"status":""
}
],
"reason":"",
"reasonForFailure":"",
"remark":"自提, 提货时间：2020-12-24 18:00:00 , 饿了么订单号：5015398442799490083 0",
"status":"6",
"statusDesc":"已完成",
"storeType":1
},
"payInfos":[
{
"accountId":"",
"amount":1250,
"fmId":"",
"payCode":"",
"payType":"00002",
"transNum":""
}
],
"payType":"00002",
"points":{
"basicPoint":195,
"extraPoint":0,
"nkbBasicPoint":0,
"nkbExtraPoint":0,
"otherBrandPoint":0,
"pointDetails":[],
"remainingBrandPoint":0,
"remainingNkbPoint":0,
"totalPoint":195,
"zhxPoint":0,
"familyRice":999
},
"promotions":{
"promtionDetails":[
],
"totalDiscount":0,
"totalOriginalPrice":0,
"totalPromotionPrice":0
},
"sessionId":"",
"totalAmount":290,
"totalCouponDiscount":0,
"totalDiscount":960,
"totalExcessiveCharge":0,
"wmDiscount":960,
"wmPtSharedDiscount":960,
"wmSjSharedDiscount":0
},
"orderIds":[
],
"pcId":"",
"sellerInfo":null,
"shopInfo":{
"barCounter":"",
"child_store_id":"",
"operator":"",
"posId":"1",
"selfHelpMac":null,
"storeId":"201081",
"store_type":""
},
"token":"",
"ver":1
}
\ No newline at end of file
{"channel":"214","cityId":"","delivery":{"basicPrice":0,"customerAddress":"","customerName":"","customerPhone":"13244445555","deliveryId":"","deliveryTime":"","distancePrice":0,"logisticsPhysicalCompany":"","name":"","phone":"","type":""},"invoice":{"companyName":"","invoiceType":0,"taxNum":"","title":"","transNum":"07212088889997000000619"},"offlinePoints":false,"orderContent":{"appointmentVO":{"appointmentTime":"20210721151000","isAppointment":1},"createTime":"20210721150320","customer":[{"accountId":"5849a3d494ae4ceb946ee9df83bb434c","accountType":"0","cardNo":"8820210002000005021","dyCode":"","level":"","mobileNo":""}],"deliveryFee":0,"ecoupons":[],"extendedAttributes":{"activities":[],"amountMax":18100,"discountAmount":0,"discountMax":0,"discountRate":100,"discountThreshold":0,"memberDay":0,"memberDayPoint":95,"performanceServiceFee":0,"platformServiceFee":0,"pointMemberDay":0,"pointsMax":0,"pointsMultiple":5.3,"pointsSumMax":0,"source":8},"ignorePoints":0,"orderCoupons":[],"orders":{"cancelStatus":"","deliveryStatus":"","deliveryStatusDesc":"","id":213977221039128893,"orderId":"214213992792753493255","orderType":"002","parentId":"","pickupCode":"A0011","pickupPoint":"002","products":[{"additionalProducts":[],"attributes":"","catgId":"994001","couponQty":0,"groupIndex":"","groupName":"","name":"早餐活动加价换购","originalPrice":900,"price":900,"productCode":"10_20850869","productType":"21","qty":1,"sku":"20850869","source":"","specs":[{"extraPrice":100,"name":"香卤蛋（带壳）","originalPrice":200,"price":200,"qty":1,"sku":"20708443"},{"extraPrice":100,"name":"奥尔良鸡腿割包","originalPrice":590,"price":300,"qty":1,"sku":"20374693"},{"extraPrice":0,"name":"日光现磨豆浆（原味）","originalPrice":300,"price":300,"qty":1,"sku":"20186647"}],"status":""},{"additionalProducts":[],"attributes":"","catgId":"994001","couponQty":0,"groupIndex":"","groupName":"","name":"早餐10元套餐1","originalPrice":1000,"price":1000,"productCode":"10_0600521","productType":"21","qty":1,"sku":"20852344","source":"","specs":[{"extraPrice":0,"name":"味全严选牧场牛奶(小)","originalPrice":680,"price":600,"qty":1,"sku":"20402754"},{"extraPrice":0,"name":"梅菜烧肉包（新）","originalPrice":320,"price":100,"qty":1,"sku":"20660673"},{"extraPrice":0,"name":"孜然烤鸡大口饭团","originalPrice":580,"price":300,"qty":1,"sku":"20342883"}],"status":""},{"additionalProducts":[],"attributes":"","catgId":"726006","couponQty":0,"groupIndex":"","groupName":"","name":"全家生物降解大号购物袋","originalPrice":90,"price":90,"productCode":"10_0571517","productType":"1","qty":1,"sku":"20823436","source":"","specs":[],"status":""}],"reason":"地址信息填写错误","reasonForFailure":"","remark":"","status":"40005","statusDesc":"用户退款申请成功","storeType":0},"payInfos":[{"accountId":"8820210002000005021","amount":1990,"fmId":"TZHLC1O2566496104","payCode":"","payType":"10036","performanceServiceFee":0,"platformServiceFee":0,"transNum":"2021072122001473981458298876"}],"payType":"10036","points":{"basicPoint":0,"extraPoint":0,"familyRice":0,"nkbBasicPoint":95,"nkbExtraPoint":0,"pointDetails":[],"totalPoint":95,"zhxPoint":0},"promotions":null,"sessionId":"2142088882139927919020495420","totalAmount":1990,"totalCouponDiscount":0,"totalDiscount":0,"totalExcessiveCharge":0,"wmDiscount":0,"wmPtSharedDiscount":0,"wmSjSharedDiscount":0},"orderIds":[],"pcId":"10","sellerInfo":null,"shopInfo":{"barCounter":"","child_store_id":"","operator":"","posId":"4","selfHelpMac":{"id":"","shelf":""},"storeId":"208888","store_type":"null"},"token":"","ver":0}
\ No newline at end of file
src/JsonModule.cpp
......@@ -244,6 +244,8 @@ bool JsonModule::getPushOrders(IN const char* json,OUT orderObj &order)
structProductSpec.price = GetJsonIntSafe(specs_obj,"price");
structProductSpec.qty = GetJsonIntSafe(specs_obj,"qty");
structProductSpec.sku = GetJsonStringSafe(specs_obj,"sku");
structProductSpec.extraPrice = GetJsonIntSafe(specs_obj, "extraPrice");
structProductSpec.originalPrice = GetJsonIntSafe(specs_obj, "originalPrice");
structProduct.vecSpec.push_back(structProductSpec);
}
......@@ -1120,6 +1122,10 @@ std::string JsonModule::_convertToNewOrderJson(orderObj &obj)
writer.Int(obj.vecProducts[i].vecSpec[j].qty);
writer.Key("sku");
writer.String(obj.vecProducts[i].vecSpec[j].sku.c_str());
writer.Key("extraPrice");
writer.Int(obj.vecProducts[i].vecSpec[j].extraPrice);
writer.Key("originalPrice");
writer.Int(obj.vecProducts[i].vecSpec[j].originalPrice);
writer.EndObject();
}
......
src/JsonModule.h
......@@ -12,7 +12,7 @@ extern std::string g_pos_id;
extern bool g_pos_ismaster;
#define VERSION "1.2.7 RC" //版本号；
#define VERSION "1.2.7-1 RC" //版本号；
class JsonModule
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment