Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-20 c161f76f78fead2519b8a66ab30d6e7389deead1

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java

@@ -193,6 +193,7 @@
        shopOrder.setUserId(sysVipInfo.getId());
        shopOrder.setCreateBy("微信小程序生成");
        shopOrder.setUpdateBy("微信小程序生成");
        shopOrder.setPayMethod(shopOrderDto.getPayMethod());
        shopOrder.setCommodityPrice(discountExplain.getBillPrice());
        shopOrder.setPurchaseQuantity(orderCount);
        shopOrder.setOrderType(ShopOrder.ORDER_TYPE_GOODS);