Merge remote-tracking branch 'origin/master'

admin

2019-03-06 55017f3ef6df7364853f224a7704cdc4417ca202

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -438,9 +438,9 @@
            // 非自购的订单 不显示返利、免单详情

            if (HongBaoV2.TYPE_ZIGOU != hongBaoType) {

                // 订单标识

                order.setSignList(signList);;

                return;

            }

                order.setSignList(signList);

				
            } else {

            

            // 是否免单商品

            boolean freeOrder = false;

@@ -545,7 +545,7 @@
                

                order.setRewardDetail(rewardMap);

            }

			
            }

        }

    }