修改类目信息

cash-service/order-service/src/main/java/com/czg/service/order/dto/AggregateMerchantVO.java

@@ -32,6 +32,8 @@ public class AggregateMerchantVO extends AggregateMerchantDto{
      * 微信进件签名地址
      */
     private String wechatSignUrl;
+    private String wechatApplyId;
+    private String alipayOrderId;
 
     /**
      * {@link com.czg.PayCst.EntryStatus}

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java

@@ -131,9 +131,11 @@ public class ShopDirectMerchantServiceImpl extends ServiceImpl<ShopDirectMerchan
         // 设置其他字段
         vo.setCreateTime(entity.getCreateTime());
         vo.setUpdateTime(entity.getUpdateTime());
+        vo.setWechatApplyId(entity.getWechatApplyId());
         vo.setWechatStatus(entity.getWechatStatus());
         vo.setWechatErrorMsg(entity.getWechatErrorMsg());
         vo.setWechatSignUrl(entity.getWechatSignUrl());
+        vo.setAlipayOrderId(entity.getAlipayOrderId());
         vo.setAlipayStatus(entity.getAlipayStatus());
         vo.setAlipayErrorMsg(entity.getAlipayErrorMsg());
         vo.setAlipaySignUrl(entity.getAlipaySignUrl());