|
|
@ -47,7 +47,7 @@ def general_goods_field(_data, ecard_level=None): |
|
|
|
optional_package.append({'index': key, 'members': member}) |
|
|
|
optional_package.append({'index': key, 'members': member}) |
|
|
|
info['optional_package'] = optional_package |
|
|
|
info['optional_package'] = optional_package |
|
|
|
info['price'] = str(f2(info['price']) + add_price) |
|
|
|
info['price'] = str(f2(info['price']) + add_price) |
|
|
|
total_cash = f2(total_cash) + f2(info['price']) |
|
|
|
total_cash = f2(total_cash) + f2(info['price']*info['num']) |
|
|
|
params.append(info) |
|
|
|
params.append(info) |
|
|
|
if g.get('discount1', False): |
|
|
|
if g.get('discount1', False): |
|
|
|
total_discount = f2(0) |
|
|
|
total_discount = f2(0) |
|
|
@ -168,8 +168,8 @@ def general_goods_field_member(_goods_data, _data): |
|
|
|
add_price += f2(m['addPrice']) |
|
|
|
add_price += f2(m['addPrice']) |
|
|
|
optional_package.append({'index': key, 'members': member}) |
|
|
|
optional_package.append({'index': key, 'members': member}) |
|
|
|
info['optional_package'] = optional_package |
|
|
|
info['optional_package'] = optional_package |
|
|
|
info['price'] = info['price'] + add_price |
|
|
|
info['price'] += add_price |
|
|
|
total_cash = f2(total_cash) + f2(info['price']) |
|
|
|
total_cash = f2(total_cash) + f2(info['price']*info['num']) |
|
|
|
params.append(info) |
|
|
|
params.append(info) |
|
|
|
|
|
|
|
|
|
|
|
print('general_goods_param---------params', params) |
|
|
|
print('general_goods_param---------params', params) |
|
|
|