造假数据 给前端联调

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -73,6 +73,7 @@ import cn.freemud.service.CouponActivityService;
 import cn.freemud.service.OrderAdapterService;
 import cn.freemud.service.Orderservice;
 import cn.freemud.service.business.OrderBusinessService;
+import cn.freemud.service.job.DemoDataMsg;
 import cn.freemud.service.order.OrderRelationFactory;
 import cn.freemud.service.order.OrderRelationService;
 import cn.freemud.service.thirdparty.*;
@@ -1332,138 +1333,15 @@ public class OrderServiceImpl implements Orderservice {
                 queryOrderResponseVo.setWechatCouponInfo(oldPayGift.getWechatCouponInfo());
                 queryOrderResponseVo.setPayGiftReps(oldPayGift);
             }
-            //queryOrderResponseVo.setNewPayGift(result.getNewPayGift());
-            queryOrderResponseVo.setNewPayGift(getDemoData());
+            queryOrderResponseVo.setNewPayGift(result.getNewPayGift());
+            // 造假数据 fisherman
+            if (CollectionUtils.isEmpty(result.getNewPayGift())) {
+                queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
+            }
 
         }
     }
 
-    private List<PayGiftCheckAndJoinResponseDtoNew> getDemoData() {
-        List<PayGiftCheckAndJoinResponseDtoNew> list = new ArrayList<>();
-        PayGiftCheckAndJoinResponseDtoNew demo1 = new PayGiftCheckAndJoinResponseDtoNew();
-        demo1.setSendType(0);
-        demo1.setType("6");
-        demo1.setSyncWechat("0");
-        PayGiftWechatCouponInfoVo demo11 = new PayGiftWechatCouponInfoVo();
-        demo11.setSend_coupon_merchant("发券商户号");
-        demo11.setSend_coupon_params(new ArrayList<>());
-        demo11.setSign("this is sign");
-        demo1.setWechatCouponInfo(demo11);
-        List<PayGiftCouponVo>  demo111  =new ArrayList<>();
-        for (int i = 0; i < 2; i++) {
-            PayGiftCouponVo vo = new PayGiftCouponVo();
-            vo.setCouponType(i);
-            vo.setActivityCode(i+"");
-            vo.setCouponCode(i+"");
-            vo.setCouponName(i+"");
-            vo.setExpiryTime(i+"");
-            vo.setDiscountAmount(i);
-            vo.setEffectiveData(i+"");
-            vo.setBenefitRebate(i+"");
-            vo.setLogo(i+"");
-            vo.setMinAmount(i+"");
-            demo111.add(vo);
-        }
-        demo1.setCoupons(demo111);
-
-        List<ActivitysDtoNew>  demo1111  =new ArrayList<>();
-        for (int i = 0; i < 2; i++) {
-            ActivitysDtoNew vo = new ActivitysDtoNew();
-            vo.setActivityId(i+"");
-            vo.setActivityName(i+"");
-            vo.setActivityPicture(i+"");
-            vo.setRedirectType(5+"");
-            vo.setRedirectPage(i+"");
-            demo1111.add(vo);
-        }
-        demo1.setActivitys(demo1111);
-        list.add(demo1);
-
-        // ==========
-
-        PayGiftCheckAndJoinResponseDtoNew demo2 = new PayGiftCheckAndJoinResponseDtoNew();
-        demo2.setSendType(5);
-        demo2.setType("6");
-        demo2.setSyncWechat("2");
-        PayGiftWechatCouponInfoVo demo22 = new PayGiftWechatCouponInfoVo();
-        demo22.setSend_coupon_merchant("发券商户号");
-        demo22.setSend_coupon_params(new ArrayList<>());
-        demo22.setSign("this is sign");
-        demo2.setWechatCouponInfo(demo22);
-        List<PayGiftCouponVo>  demo222  =new ArrayList<>();
-        for (int i = 0; i < 2; i++) {
-            PayGiftCouponVo vo = new PayGiftCouponVo();
-            vo.setCouponType(i);
-            vo.setActivityCode(i+"");
-            vo.setCouponCode(i+"");
-            vo.setCouponName(i+"");
-            vo.setExpiryTime(i+"");
-            vo.setDiscountAmount(i);
-            vo.setEffectiveData(i+"");
-            vo.setBenefitRebate(i+"");
-            vo.setLogo(i+"");
-            vo.setMinAmount(i+"");
-            demo222.add(vo);
-        }
-        demo2.setCoupons(demo222);
-
-        List<ActivitysDtoNew>  demo2222  =new ArrayList<>();
-        for (int i = 0; i < 2; i++) {
-            ActivitysDtoNew vo = new ActivitysDtoNew();
-            vo.setActivityId(i+"");
-            vo.setActivityName(i+"");
-            vo.setActivityPicture(i+"");
-            vo.setRedirectType(5+"");
-            vo.setRedirectPage(i+"");
-            demo2222.add(vo);
-        }
-        demo2.setActivitys(demo2222);
-        list.add(demo2);
-
-
-        PayGiftCheckAndJoinResponseDtoNew demo3 = new PayGiftCheckAndJoinResponseDtoNew();
-        demo3.setSendType(5);
-        demo3.setType("6");
-        demo3.setSyncWechat("2");
-        PayGiftWechatCouponInfoVo demo33 = new PayGiftWechatCouponInfoVo();
-        demo33.setSend_coupon_merchant("发券商户号");
-        demo33.setSend_coupon_params(new ArrayList<>());
-        demo33.setSign("this is sign");
-        demo3.setWechatCouponInfo(demo33);
-        List<PayGiftCouponVo>  demo333  =new ArrayList<>();
-        for (int i = 0; i < 2; i++) {
-            PayGiftCouponVo vo = new PayGiftCouponVo();
-            vo.setCouponType(i);
-            vo.setActivityCode(i+"");
-            vo.setCouponCode(i+"");
-            vo.setCouponName(i+"");
-            vo.setExpiryTime(i+"");
-            vo.setDiscountAmount(i);
-            vo.setEffectiveData(i+"");
-            vo.setBenefitRebate(i+"");
-            vo.setLogo(i+"");
-            vo.setMinAmount(i+"");
-            demo333.add(vo);
-        }
-        demo3.setCoupons(demo333);
-
-        List<ActivitysDtoNew>  demo3333  =new ArrayList<>();
-        for (int i = 0; i < 2; i++) {
-            ActivitysDtoNew vo = new ActivitysDtoNew();
-            vo.setActivityId(i+"");
-            vo.setActivityName(i+"");
-            vo.setActivityPicture(i+"");
-            vo.setRedirectType(5+"");
-            vo.setRedirectPage(i+"");
-            demo3333.add(vo);
-        }
-        demo3.setActivitys(demo3333);
-        list.add(demo3);
-
-
-        return list;
-
-    }
 
     private void orderStatusTracking(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderStatusTrackingInfoDto orderStatusTrackingInfoByOid) {
         List<OrderStatusTrackingInfoDto.OrderStatusTrackingInfo> data = orderStatusTrackingInfoByOid.getData();

order-application-service/src/main/java/cn/freemud/service/job/DemoDataMsg.java

+package cn.freemud.service.job;
+
+import cn.freemud.entities.dto.activity.ActivitysDtoNew;
+import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDtoNew;
+import cn.freemud.entities.vo.PayGiftCouponVo;
+import cn.freemud.entities.vo.PayGiftWechatCouponInfoVo;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2021/6/25 上午10:26
+ * @description :
+ */
+@Data
+public class DemoDataMsg {
+
+    /**
+     *  fisherman 假数据
+     * @return
+     */
+    public List<PayGiftCheckAndJoinResponseDtoNew> getDemoData() {
+        List<PayGiftCheckAndJoinResponseDtoNew> list = new ArrayList<>();
+        PayGiftCheckAndJoinResponseDtoNew demo1 = new PayGiftCheckAndJoinResponseDtoNew();
+        demo1.setSendType(0);
+        demo1.setType("6");
+        demo1.setSyncWechat("0");
+        demo1.setWechatCouponInfo(getWechatCouponInfo());
+        demo1.setCoupons(getCoupons());
+        demo1.setActivitys(getactivityDemo());
+        list.add(demo1);
+
+        // 第二个
+        PayGiftCheckAndJoinResponseDtoNew demo2 = new PayGiftCheckAndJoinResponseDtoNew();
+        demo2.setSendType(5);
+        demo2.setType("6");
+        demo2.setSyncWechat("0");
+        demo2.setWechatCouponInfo(getWechatCouponInfo());
+        demo2.setCoupons(getCoupons());
+        demo2.setActivitys(getactivityDemo());
+        list.add(demo2);
+
+        // 第三个
+        PayGiftCheckAndJoinResponseDtoNew demo3 = new PayGiftCheckAndJoinResponseDtoNew();
+        demo3.setSendType(5);
+        demo3.setType("6");
+        demo3.setSyncWechat("2");
+        demo3.setWechatCouponInfo(getWechatCouponInfo());
+        demo3.setCoupons(getCoupons());
+        demo3.setActivitys(getactivityDemo());
+        list.add(demo3);
+        // 4
+        PayGiftCheckAndJoinResponseDtoNew demo4 = new PayGiftCheckAndJoinResponseDtoNew();
+        demo4.setSendType(5);
+        demo4.setType("6");
+        demo4.setSyncWechat("3");
+        demo4.setWechatCouponInfo(getWechatCouponInfo());
+        demo4.setCoupons(getCoupons());
+        demo4.setActivitys(getactivityDemo());
+        list.add(demo4);
+
+        return list;
+
+    }
+
+
+    // fisherman 假数据
+    private List<ActivitysDtoNew> getactivityDemo(){
+        List<ActivitysDtoNew>  demo1111  =new ArrayList<>();
+        for (int i = 0; i < 2; i++) {
+            ActivitysDtoNew vo = new ActivitysDtoNew();
+            vo.setActivityId(i+"");
+            vo.setActivityName(i+"");
+            vo.setActivityPicture(i+"");
+            vo.setRedirectType(5+"");
+            vo.setRedirectPage(i+"");
+            demo1111.add(vo);
+        }
+        return demo1111;
+    };
+    // fisherman 假数据
+    private List<PayGiftCouponVo>  getCoupons(){
+        List<PayGiftCouponVo>  demo111  =new ArrayList<>();
+        for (int i = 0; i < 2; i++) {
+            PayGiftCouponVo vo = new PayGiftCouponVo();
+            vo.setCouponType(i);
+            vo.setActivityCode(i+"");
+            vo.setCouponCode(i+"");
+            vo.setCouponName(i+"");
+            vo.setExpiryTime(i+"");
+            vo.setDiscountAmount(i);
+            vo.setEffectiveData(i+"");
+            vo.setBenefitRebate(i+"");
+            vo.setLogo(i+"");
+            vo.setMinAmount(i+"");
+            demo111.add(vo);
+        }
+        return demo111;
+
+    };
+
+    // fisherman 假数据
+    private PayGiftWechatCouponInfoVo  getWechatCouponInfo(){
+        PayGiftWechatCouponInfoVo demo11 = new PayGiftWechatCouponInfoVo();
+        demo11.setSend_coupon_merchant("发券商户号");
+        demo11.setSend_coupon_params(new ArrayList<>());
+        demo11.setSign("this is sign");
+        return demo11;
+
+    };
+
+
+}