|
@@ -2786,9 +2786,13 @@ public class WeiXinCorpController {
|
|
wxOrder.setOrderStatus(orderDetail.getInteger("order_status"));
|
|
wxOrder.setOrderStatus(orderDetail.getInteger("order_status"));
|
|
wxOrder.setOrderType(orderDetail.getInteger("order_type"));
|
|
wxOrder.setOrderType(orderDetail.getInteger("order_type"));
|
|
wxOrder.setPaidCorpid(orderDetail.getString("paid_corpid"));
|
|
wxOrder.setPaidCorpid(orderDetail.getString("paid_corpid"));
|
|
- wxOrder.setOperatorId(orderDetail.getString("operator_id"));
|
|
|
|
|
|
+ if (orderDetail.containsKey("operator_id")){
|
|
|
|
+ wxOrder.setOperatorId(orderDetail.getString("operator_id"));
|
|
|
|
+ }
|
|
wxOrder.setSuiteid(orderDetail.getString("suiteid"));
|
|
wxOrder.setSuiteid(orderDetail.getString("suiteid"));
|
|
- wxOrder.setAppid(orderDetail.getString("appid"));
|
|
|
|
|
|
+ if (orderDetail.containsKey("appid")){
|
|
|
|
+ wxOrder.setAppid(orderDetail.getString("appid"));
|
|
|
|
+ }
|
|
wxOrder.setEditionId(orderDetail.getString("edition_id"));
|
|
wxOrder.setEditionId(orderDetail.getString("edition_id"));
|
|
wxOrder.setEditionName(orderDetail.getString("edition_name"));
|
|
wxOrder.setEditionName(orderDetail.getString("edition_name"));
|
|
wxOrder.setPrice(orderDetail.getDouble("price"));
|
|
wxOrder.setPrice(orderDetail.getDouble("price"));
|
|
@@ -2807,9 +2811,11 @@ public class WeiXinCorpController {
|
|
wxOrder.setServiceShareAmount(orderDetail.getString("service_share_amount"));
|
|
wxOrder.setServiceShareAmount(orderDetail.getString("service_share_amount"));
|
|
wxOrder.setPlatformShareAmount(orderDetail.getString("platform_share_amount"));
|
|
wxOrder.setPlatformShareAmount(orderDetail.getString("platform_share_amount"));
|
|
wxOrder.setDealerShareAmount(orderDetail.getString("dealer_share_amount"));
|
|
wxOrder.setDealerShareAmount(orderDetail.getString("dealer_share_amount"));
|
|
- JSONObject dealer_corp_info = orderDetail.getJSONObject("dealer_corp_info");
|
|
|
|
- wxOrder.setDealerCorpid(dealer_corp_info.getString("corpid"));
|
|
|
|
- wxOrder.setDealerCorpName(dealer_corp_info.getString("corp_name"));
|
|
|
|
|
|
+ if (orderDetail.containsKey("dealer_corp_info")){
|
|
|
|
+ JSONObject dealer_corp_info = orderDetail.getJSONObject("dealer_corp_info");
|
|
|
|
+ wxOrder.setDealerCorpid(dealer_corp_info.getString("corpid"));
|
|
|
|
+ wxOrder.setDealerCorpName(dealer_corp_info.getString("corp_name"));
|
|
|
|
+ }
|
|
//获取该公司对象
|
|
//获取该公司对象
|
|
WxCorpInfo corpid = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("corpid", wxOrder.getPaidCorpid()));
|
|
WxCorpInfo corpid = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("corpid", wxOrder.getPaidCorpid()));
|
|
Company company = companyMapper.selectById(corpid.getCompanyId());
|
|
Company company = companyMapper.selectById(corpid.getCompanyId());
|