修改app注册

src/main/java/com/pangding/web/authority/dao/WechatUserDao.java

@@ -21,5 +21,5 @@ public interface WechatUserDao extends BaseDao {
      */
     Object getUserNum(WechatUserGetReqVo getReqVo);
 
-    PageSizeData<WechatUserVo> getUserList(PrecipitationReqVo reqVo);
+    PageSizeData<WechatUserVo> getUserList(WechatUserGetReqVo reqVo);
 }

src/main/java/com/pangding/web/authority/dao/impl/CompanyDivideRuleDaoImpl.java

@@ -16,7 +16,7 @@ public class CompanyDivideRuleDaoImpl extends BaseDaoImpl implements CompanyDivi
     protected void init() {
         register(CompanyDivideRuleVo.class);
 
-        table.add(QUERY_LIST, "select cdr.*,ce.divide_status from pd_company_divide_rule cdr left join pd_company c on c.id = cdr.company_id " +
+        table.add(QUERY_LIST, "select cdr.*,ce.divide_status,c.company_name from pd_company_divide_rule cdr left join pd_company c on c.id = cdr.company_id " +
                 "left join pd_company_extend ce on c.id = ce.id where 1=1 ")
         .add("companyId"," and cdr.company_id = ?");
     }

src/main/java/com/pangding/web/authority/dao/impl/WechatUserDaoImpl.java

@@ -31,10 +31,10 @@ public class WechatUserDaoImpl extends BaseDaoImpl implements WechatUserDao {
                 .add("start","and subscribe_date >= ? ")
                 .add("end","and subscribe_date < ? ");
 
-        table.add(GET_USER_LIST,"select * from pd_wechat_user where 1=1 ")
+        table.add(GET_USER_LIST,"select * from pd_wechat_user where 1=1 {WHERE} order by subscribe_date desc")
                 .add("start","and subscribe_date >= ? ")
                 .add("end","and subscribe_date < ? ")
-                .add("sourceCompanyId","and source_company_id = ? order by subscribe_date desc");
+                .add("sourceCompanyId","and source_company_id = ? ");
     }
 
     @Override
@@ -43,7 +43,7 @@ public class WechatUserDaoImpl extends BaseDaoImpl implements WechatUserDao {
     }
 
     @Override
-    public PageSizeData<WechatUserVo> getUserList(PrecipitationReqVo reqVo) {
+    public PageSizeData<WechatUserVo> getUserList(WechatUserGetReqVo reqVo) {
         return this.queryPage(WechatUserVo.class,reqVo,GET_USER_LIST,reqVo);
     }
 }

src/main/java/com/pangding/web/authority/service/impl/DataServiceImpl.java

@@ -32,8 +32,6 @@ public class DataServiceImpl implements DataService {
     @Autowired
     private CompanyBankCardDao companyBankCardDaoImpl;
     @Autowired
-    private UserRoleDao userRoleDaoImpl;
-    @Autowired
     private OrderDao orderDaoImpl;
     @Autowired
     private OrderExtendDao orderExtendDaoImpl;
@@ -334,13 +332,13 @@ public class DataServiceImpl implements DataService {
         for (TyyOrderbackVo tyyOrderbackVo : tyyOrderbackVoList) {
             OrderRefundVo orderRefundVo = new OrderRefundVo();
             orderRefundVo.setId(tyyOrderbackVo.getId());
-            orderRefundVo.setOrder_id(tyyOrderbackVo.getOrdersn());
-            orderRefundVo.setOperator(tyyOrderbackVo.getAcceptanceuser());
-            orderRefundVo.setRefund_status(tyyOrderbackVo.getRefundstatus());
-            orderRefundVo.setRefund_date(tyyOrderbackVo.getRefundtime());
-            orderRefundVo.setRefund_fee(tyyOrderbackVo.getRefundFee());
-            orderRefundVo.setRefund_amount(tyyOrderbackVo.getReceiveMoney());
-            orderRefundVo.setRefund_reason(tyyOrderbackVo.getRefundReason());
+            orderRefundVo.setOrderId(tyyOrderbackVo.getOrdersn());
+            orderRefundVo.setRefundStatus(Integer.parseInt(tyyOrderbackVo.getRefundstatus()));
+            orderRefundVo.setRefundDate(tyyOrderbackVo.getRefundtime());
+            orderRefundVo.setRefundFee(tyyOrderbackVo.getRefundFee());
+            orderRefundVo.setRefundMoney(tyyOrderbackVo.getReceiveMoney());
+            orderRefundVo.setRefundReason(tyyOrderbackVo.getRefundReason());
+            orderRefundVo.setPdRefundMoney(tyyOrderbackVo.getRefundMoney());
             /*若该id存在则跳过,不存在则新增*/
             OrderRefundGetReqVo orderRefundGetReqVo = new OrderRefundGetReqVo();
             orderRefundGetReqVo.setId(orderRefundVo.getId());
@@ -521,17 +519,33 @@ public class DataServiceImpl implements DataService {
         orderVo.setId(tyyOrderVo.getId());
         orderVo.setPid(tyyOrderVo.getPid());
         orderVo.setOrder_type(tyyOrderVo.getOrder_type());
+        if(2 == tyyOrderVo.getSub_order_type()){
+            orderVo.setSub_order_type(0);
+        }else if(3 == tyyOrderVo.getSub_order_type()){
+            orderVo.setSub_order_type(2);
+        }else {
             orderVo.setSub_order_type(tyyOrderVo.getSub_order_type());
+        }
         if (StringHelper.isEmpty(tyyOrdersVo)) {
             String productName = tyyOrderVo.getProduct_name();
+            if(!StringHelper.isEmpty(productName)){
                 int index = productName.indexOf("(");
+                if(index>0){
                     String merchantName = productName.substring(0,index);
                     productName = productName.substring(index + 1 , productName.length() - 1);
                     orderVo.setProduct_name(productName);
                     orderVo.setMerchant_name(merchantName);
+                }else{
+                    orderVo.setProduct_name(productName);
+                    orderVo.setMerchant_name(productName);
+                }
+
+            }
         } else {
             orderVo.setProduct_name(tyyOrdersVo.getConsignee());
             orderVo.setMerchant_name(tyyOrdersVo.getScenicspotname());
+            orderVo.setProduct_code(StringHelper.isEmpty(tyyOrdersVo.getProductsn()) ? "" : tyyOrdersVo.getProductsn());
+            orderVo.setArea_code(tyyOrdersVo.getSight_spot_code());
         }
         orderVo.setPlay_date(tyyOrderVo.getPlay_date());
         orderVo.setUnit_price(StringHelper.isEmpty(tyyOrderVo.getPrice()) ? 0 : tyyOrderVo.getPrice());
@@ -557,14 +571,14 @@ public class DataServiceImpl implements DataService {
         orderVo.setRefund_money(StringHelper.isEmpty(tyyOrderVo.getReturn_money()) ? 0 : tyyOrderVo.getReturn_money());
         orderVo.setPd_refund_money(tyyOrderVo.getReturn_money());
         orderVo.setOrder_time(tyyOrderVo.getCreate_date());
-        orderVo.setProduct_code(tyyOrdersVo.getProductsn());
-        orderVo.setArea_code(tyyOrdersVo.getSight_spot_code());
+        orderVo.setUser_id(tyyOrderVo.getUser_id());
+
 
         /*若存在则修改，不存在则添加*/
         OrderGetReqVo orderGetReqVo = new OrderGetReqVo();
         orderGetReqVo.setId(orderVo.getId());
         OrderVo orderVo1 = orderDaoImpl.load(orderGetReqVo, OrderVo.class);
-        if (null == orderVo1) {
+        if (StringHelper.isEmpty(orderVo1)) {
             orderDaoImpl.create(orderVo);
         } else {
             ObjectHelper.writeWithFrom(orderVo1, orderVo);
@@ -588,6 +602,11 @@ public class DataServiceImpl implements DataService {
                 orderStatusVo.setPayment_status(1);
             }
         }
+        if(2 == tyyOrderVo.getSub_order_type() || 10 == tyyOrderVo.getOrder_type()){
+            orderStatusVo.setDivide_status(1);
+        }else{
+            orderStatusVo.setDivide_status(0);
+        }
         if (StringHelper.isEmpty(tyyOrdersVo)) {
 
         } else {
@@ -600,7 +619,7 @@ public class DataServiceImpl implements DataService {
         OrderStatusGetReqVo orderStatusGetReqVo = new OrderStatusGetReqVo();
         orderStatusGetReqVo.setId(orderStatusVo.getId());
         OrderStatusVo orderStatusVo1 = orderStatusDaoImpl.load(orderStatusGetReqVo, OrderStatusVo.class);
-        if (null == orderStatusVo1) {
+        if (StringHelper.isEmpty(orderStatusVo1)) {
             orderStatusDaoImpl.create(orderStatusVo);
         } else {
             ObjectHelper.writeWithFrom(orderStatusVo1, orderStatusVo);
@@ -711,13 +730,13 @@ public class DataServiceImpl implements DataService {
         for (TyyOrderbackVo tyyOrderbackVo : tyyOrderbackVoList) {
             OrderRefundVo orderRefundVo = new OrderRefundVo();
             orderRefundVo.setId(tyyOrderbackVo.getId());
-            orderRefundVo.setOrder_id(tyyOrderbackVo.getOrdersn());
-            orderRefundVo.setOperator(tyyOrderbackVo.getAcceptanceuser());
-            orderRefundVo.setRefund_status(tyyOrderbackVo.getRefundstatus());
-            orderRefundVo.setRefund_date(tyyOrderbackVo.getRefundtime());
-            orderRefundVo.setRefund_fee(tyyOrderbackVo.getRefundFee());
-            orderRefundVo.setRefund_amount(tyyOrderbackVo.getReceiveMoney());
-            orderRefundVo.setRefund_reason(tyyOrderbackVo.getRefundReason());
+            orderRefundVo.setOrderId(tyyOrderbackVo.getOrdersn());
+            orderRefundVo.setRefundStatus(Integer.parseInt(tyyOrderbackVo.getRefundstatus()));
+            orderRefundVo.setRefundDate(tyyOrderbackVo.getRefundtime());
+            orderRefundVo.setRefundFee(tyyOrderbackVo.getRefundFee());
+            orderRefundVo.setRefundMoney(tyyOrderbackVo.getReceiveMoney());
+            orderRefundVo.setRefundReason(tyyOrderbackVo.getRefundReason());
+            orderRefundVo.setPdRefundMoney(tyyOrderbackVo.getRefundMoney());
             /*若存在则修改，不存在则添加*/
             OrderRefundGetReqVo orderRefundGetReqVo = new OrderRefundGetReqVo();
             orderRefundGetReqVo.setId(tyyOrderbackVo.getId());

src/main/java/com/pangding/web/authority/service/impl/PangdingPartnerServiceImpl.java

@@ -203,7 +203,7 @@ public class PangdingPartnerServiceImpl implements PangdingPartnerService {
         /*沉淀用户分页列表*/
         WechatUserGetReqVo userListGetReqVo = new WechatUserGetReqVo();
         userListGetReqVo.setSourceCompanyId(reqVo.getCompanyId());
-        PageSizeData<WechatUserVo> wechatUserVoList = wechatUserDaoImpl.getUserList(reqVo);
+        PageSizeData<WechatUserVo> wechatUserVoList = wechatUserDaoImpl.getUserList(userListGetReqVo);
         resVo.setWechatUserVoList(wechatUserVoList);
         return resVo;
     }

src/main/java/com/pangding/web/authority/vo/OrderRefundVo.java

@@ -8,20 +8,69 @@ import com.yanzuoguang.dao.TableAnnotation;
  */
 @TableAnnotation("pd_order_refund")
 public class OrderRefundVo {
+    /**
+     * 编号
+     */
+    @TableAnnotation("id")
     private String id;
-    private String order_id;
+    /**
+     * 订单编号
+     */
+    @TableAnnotation("order_id")
+    private String orderId;
+
+    /**
+     * 胖丁退款金额
+     */
+    @TableAnnotation("pd_refund_money")
+    private double pdRefundMoney;
     /**
      * 退款金额
      */
-    private Double refund_amount;
+    @TableAnnotation("refund_money")
+    private double refundMoney;
+
+    /**
+     * 胖丁退款手续费
+     */
+    @TableAnnotation("pd_refund_fee")
+    private double pdRefundFee;
+
     /**
      * 退款手续费
      */
-    private Double refund_fee;
-    private String refund_reason;
-    private String refund_status;
-    private String refund_date;
-    private String operator;
+    @TableAnnotation("refund_fee")
+    private double refundFee;
+
+    /**
+     * 退款理由
+     */
+    @TableAnnotation("refund_reason")
+    private String refundReason;
+
+    /**
+     * 退款状态
+     */
+    @TableAnnotation("refund_status")
+    private int refundStatus;
+
+    /**
+     * 退款时间
+     */
+    @TableAnnotation("refund_date")
+    private String refundDate;
+
+    /**
+     * 失败原因
+     */
+    @TableAnnotation("error_message")
+    private String errorMessage;
+
+    @TableAnnotation("tonglian_id")
+    private String tonglianId;
+
+    @TableAnnotation("pay_refund_id")
+    private String payRefundId;
 
     public String getId() {
         return id;
@@ -31,59 +80,91 @@ public class OrderRefundVo {
         this.id = id;
     }
 
-    public String getOrder_id() {
-        return order_id;
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public double getPdRefundMoney() {
+        return pdRefundMoney;
+    }
+
+    public void setPdRefundMoney(double pdRefundMoney) {
+        this.pdRefundMoney = pdRefundMoney;
+    }
+
+    public double getRefundMoney() {
+        return refundMoney;
+    }
+
+    public void setRefundMoney(double refundMoney) {
+        this.refundMoney = refundMoney;
+    }
+
+    public double getPdRefundFee() {
+        return pdRefundFee;
+    }
+
+    public void setPdRefundFee(double pdRefundFee) {
+        this.pdRefundFee = pdRefundFee;
+    }
+
+    public double getRefundFee() {
+        return refundFee;
     }
 
-    public void setOrder_id(String order_id) {
-        this.order_id = order_id;
+    public void setRefundFee(double refundFee) {
+        this.refundFee = refundFee;
     }
 
-    public Double getRefund_amount() {
-        return refund_amount;
+    public String getRefundReason() {
+        return refundReason;
     }
 
-    public void setRefund_amount(Double refund_amount) {
-        this.refund_amount = refund_amount;
+    public void setRefundReason(String refundReason) {
+        this.refundReason = refundReason;
     }
 
-    public Double getRefund_fee() {
-        return refund_fee;
+    public int getRefundStatus() {
+        return refundStatus;
     }
 
-    public void setRefund_fee(Double refund_fee) {
-        this.refund_fee = refund_fee;
+    public void setRefundStatus(int refundStatus) {
+        this.refundStatus = refundStatus;
     }
 
-    public String getRefund_reason() {
-        return refund_reason;
+    public String getRefundDate() {
+        return refundDate;
     }
 
-    public void setRefund_reason(String refund_reason) {
-        this.refund_reason = refund_reason;
+    public void setRefundDate(String refundDate) {
+        this.refundDate = refundDate;
     }
 
-    public String getRefund_status() {
-        return refund_status;
+    public String getErrorMessage() {
+        return errorMessage;
     }
 
-    public void setRefund_status(String refund_status) {
-        this.refund_status = refund_status;
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
     }
 
-    public String getRefund_date() {
-        return refund_date;
+    public String getTonglianId() {
+        return tonglianId;
     }
 
-    public void setRefund_date(String refund_date) {
-        this.refund_date = refund_date;
+    public void setTonglianId(String tonglianId) {
+        this.tonglianId = tonglianId;
     }
 
-    public String getOperator() {
-        return operator;
+    public String getPayRefundId() {
+        return payRefundId;
     }
 
-    public void setOperator(String operator) {
-        this.operator = operator;
+    public void setPayRefundId(String payRefundId) {
+        this.payRefundId = payRefundId;
     }
 }

src/main/java/com/pangding/web/authority/vo/reqvo/WechatUserGetReqVo.java

 package com.pangding.web.authority.vo.reqvo;
 
+import com.yanzuoguang.util.vo.PageSizeData;
+
 /**
  * @Author zhangjinyao
  * @create 2019/5/29 17:25
  */
-public class WechatUserGetReqVo {
+public class WechatUserGetReqVo extends PageSizeData{
     private String reqId;
 
     private String sourceCompanyId;