Skip to content

F
familyMart_takeaway
Commit 4bd09aa1 by wuyang.zou
Options

New Feature Family: 

orderCoupons[i]数组对象字段:仅orderCoupons[i].type=P->是商品券时存在 ①bonusDayBusinessType:日商类型->入门店-S 默认值,入总部-T; ②bonusDayBusinessAmt:日商金 单位分;

Version: 1.2.7-2
parent f4cbd2e1
Showing with 16 additions and 5 deletions
README.md
...@@ -35,5 +35,7 @@ build:编译中间文件<br> ...@@ -35,5 +35,7 @@ build:编译中间文件<br>
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.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 //新增属性字段: 3.7 2021-07-22 wuyang.zou Version: 1.2.7-1 RC //新增属性字段:
products[i].specs[j] 数组对象字段: extraPrice:套餐子商品加价价格; products[i].specs[j] 数组对象字段: extraPrice:套餐子商品加价价格;originalPrice: 套餐子商品原价; <br> 扩展 extendedAttributes 对象字段, 如下: amountMax:剩余活动金额; pointsMultiple:福利分倍数; memberDayPoint:积分会员日积分
originalPrice: 套餐子商品原价; 扩展 extendedAttributes 对象字段, 如下: amountMax:剩余活动金额; pointsMultiple:福利分倍数; memberDayPoint:积分会员日积分
3.8 2021-07-26 wuyang.zou Version: 1.2.7-2 RC //新增属性字段:
orderCoupons[i] 数组对象字段: 仅orderCoupons[i].type="P"->是商品券时存在 ①bonusDayBusinessType:日商类型 ->入门店(S)默认值,入总部(T); ② bonusDayBusinessAmt:日商金(单位分);
\ No newline at end of file
base/CommonStruct.h
...@@ -167,6 +167,8 @@ struct orderCoupon ...@@ -167,6 +167,8 @@ struct orderCoupon
int remainingAmt; //还需要支付的金额 int remainingAmt; //还需要支付的金额
std::string supplierNo; //商户号 std::string supplierNo; //商户号
std::string activityId; //活动编号 std::string activityId; //活动编号
std::string bonusDayBusinessType; //日商类型:入门店(S)默认值, 入总部(T); 仅 type = "P"->商品券时存在;
int bonusDayBusinessAmt = 0; //日商金额：单位分; 仅 type = "P"->商品券时存在;
}; };
//订单结构体 //订单结构体
......
bin/testOrderJson.json
{"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} {"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":[ {"couponId":"123456","discount":0,"ebcode":"ebcode1234","securitiesTrader":"234", "totalAmount":1000, "transNum":"12344321","type":"P","useAmount":800, "remainingAmt":0,"price":1000, "sku":"234432", "campaignAmt":200,"paid":0,"remainingAmt":0, "supplierNo":"","activityId":"","bonusDayBusinessType":"S","bonusDayBusinessAmt":300} ],"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 \ No newline at end of file
src/JsonModule.cpp
...@@ -418,6 +418,8 @@ bool JsonModule::getPushOrders(IN const char* json,OUT orderObj &order) ...@@ -418,6 +418,8 @@ bool JsonModule::getPushOrders(IN const char* json,OUT orderObj &order)
coupon.remainingAmt = GetJsonIntSafe(coupon_obj, "remainingAmt"); coupon.remainingAmt = GetJsonIntSafe(coupon_obj, "remainingAmt");
coupon.supplierNo = GetJsonStringSafe(coupon_obj, "supplierNo"); coupon.supplierNo = GetJsonStringSafe(coupon_obj, "supplierNo");
coupon.activityId = GetJsonStringSafe(coupon_obj, "activityId"); coupon.activityId = GetJsonStringSafe(coupon_obj, "activityId");
coupon.bonusDayBusinessType = GetJsonStringSafe(coupon_obj, "bonusDayBusinessType");
coupon.bonusDayBusinessAmt = GetJsonIntSafe(coupon_obj, "bonusDayBusinessAmt");
order.vecOrderCoupons.push_back(coupon); order.vecOrderCoupons.push_back(coupon);
} }
...@@ -1341,6 +1343,10 @@ std::string JsonModule::_convertToNewOrderJson(orderObj &obj) ...@@ -1341,6 +1343,10 @@ std::string JsonModule::_convertToNewOrderJson(orderObj &obj)
writer.String(obj.vecOrderCoupons[i].supplierNo.c_str()); writer.String(obj.vecOrderCoupons[i].supplierNo.c_str());
writer.Key("activityId"); writer.Key("activityId");
writer.String(obj.vecOrderCoupons[i].activityId.c_str()); writer.String(obj.vecOrderCoupons[i].activityId.c_str());
writer.Key("bonusDayBusinessType");
writer.String(obj.vecOrderCoupons[i].bonusDayBusinessType.c_str());
writer.Key("bonusDayBusinessAmt");
writer.Int(obj.vecOrderCoupons[i].bonusDayBusinessAmt);
writer.EndObject(); writer.EndObject();
} }
......
src/JsonModule.h
...@@ -12,7 +12,7 @@ extern std::string g_pos_id; ...@@ -12,7 +12,7 @@ extern std::string g_pos_id;
extern bool g_pos_ismaster; extern bool g_pos_ismaster;
#define VERSION "1.2.7-1 RC" //版本号； #define VERSION "1.2.7-2 RC" //版本号；
class JsonModule 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