Merge branch 'feature/2.0.6-农工商商品兑换券' into develop

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -558,12 +558,12 @@ public class SellCouponOrderServiceImpl {
         orderItemCreateReq.setSettlementPrice(active.getSalePrice().longValue());
         orderItemCreateReq.setPartnerId(partnerId);
 
-        orderItemCreateReq.setProductId(ngsCouponProductId);
-        orderItemCreateReq.setProductSpec(ngsCouponProductId);
-        orderItemCreateReq.setProductName("卖券虚拟商品");
-        orderItemCreateReq.setProductSpecName("卖券虚拟商品");
+        orderItemCreateReq.setProductId(activityCode);
+        orderItemCreateReq.setProductSpec(activityCode);
+        orderItemCreateReq.setProductName(active.getActiveName());
+        orderItemCreateReq.setProductSpecName(active.getActiveName());
         orderItemCreateReq.setProductSeq(1);
-        orderItemCreateReq.setProductCode(ngsCouponProductId);
+        orderItemCreateReq.setProductCode(activityCode);
         orderItemCreateReq.setThirdProductId("");
         orderItemCreateReq.setProductQuantity(1);