分润查询

src/main/java/com/thinkgem/jeesite/modules/pay/api/BenefitController.java

@@ -4,6 +4,7 @@ import com.thinkgem.jeesite.common.baseBean.Request;
 import com.thinkgem.jeesite.common.baseBean.Response;
 import com.thinkgem.jeesite.common.constant.ComCode;
 import com.thinkgem.jeesite.common.utils.StringUtils;
+import com.thinkgem.jeesite.modules.pay.bean.OrderRequest;
 import com.thinkgem.jeesite.modules.pay.entity.BalanceEntity;
 import com.thinkgem.jeesite.modules.pay.entity.BenefitEntity;
 import com.thinkgem.jeesite.modules.pay.service.BenefitSevice;
@@ -40,13 +41,50 @@ public class BenefitController{
             response.setMessage(ComCode.STATUS_CODE_4001_DESC);
             return response;
         }
-        BenefitEntity entity  =  new BenefitEntity();
-        entity.setUserCode(request.getSubMerchantCode());
-        BalanceEntity balanceEntity = benefitSevice.getBalance(entity);
+        try {
+            BenefitEntity entity  =  new BenefitEntity();
+            entity.setUserCode(request.getSubMerchantCode());
+            BalanceEntity balanceEntity = benefitSevice.getBalance(entity);
+
+            response.setData(balanceEntity);
+            response.setStatus(ComCode.STATUS_CODE_2000);
+            response.setMessage(ComCode.STATUS_CODE_2000_DESC);
+            return response;
+        }catch (Exception e){
+            response.setStatus(ComCode.STATUS_CODE_9998);
+            response.setMessage(ComCode.STATUS_CODE_9998_DESC);
+            response.setError(e.getMessage());
+        }
+
+        return response;
+    }
+
+
+    /**
+     * 分润查询
+     * @param request
+     * @return
+     */
+    @PostMapping("/getBenefitList")
+    public Response getBenefitList(OrderRequest request){
+
+        Response response = new Response();
+        if(StringUtils.isBlank(request.getSubMerchantCode())){
+            response.setStatus(ComCode.STATUS_CODE_4001);
+            response.setMessage(ComCode.STATUS_CODE_4001_DESC);
+            return response;
+        }
+        try {
+            response.setData(benefitSevice.getBenefitList(request));
+            response.setStatus(ComCode.STATUS_CODE_2000);
+            response.setMessage(ComCode.STATUS_CODE_2000_DESC);
+            return response;
+        }catch (Exception e){
+            response.setStatus(ComCode.STATUS_CODE_9998);
+            response.setMessage(ComCode.STATUS_CODE_9998_DESC);
+            response.setError(e.getMessage());
+        }
 
-        response.setData(balanceEntity);
-        response.setStatus(ComCode.STATUS_CODE_2000);
-        response.setMessage(ComCode.STATUS_CODE_2000_DESC);
         return response;
     }
 }

src/main/java/com/thinkgem/jeesite/modules/pay/dao/OrderApiDao.java

@@ -2,6 +2,7 @@ package com.thinkgem.jeesite.modules.pay.dao;
 
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import com.thinkgem.jeesite.modules.pay.bean.OrderRequest;
+import com.thinkgem.jeesite.modules.pay.entity.BenefitEntity;
 import com.thinkgem.jeesite.modules.pay.entity.OrderEntity;
 
 import java.util.List;
@@ -15,4 +16,8 @@ import java.util.List;
 @MyBatisDao
 public interface OrderApiDao {
     public List<OrderEntity> getOrderList(OrderRequest request);
+
+
+    // 查询分润
+    public List<BenefitEntity> getBenefitList(OrderRequest request);
 }
\ No newline at end of file

src/main/java/com/thinkgem/jeesite/modules/pay/entity/BenefitEntity.java

@@ -17,6 +17,8 @@ public class BenefitEntity extends BaseEntity implements Serializable {
 
     private String endTime;
 
+    private OrderEntity orderEntity;
+
 
     public BenefitEntity() {
     }
@@ -105,4 +107,12 @@ public class BenefitEntity extends BaseEntity implements Serializable {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    public OrderEntity getOrderEntity() {
+        return orderEntity;
+    }
+
+    public void setOrderEntity(OrderEntity orderEntity) {
+        this.orderEntity = orderEntity;
+    }
 }

src/main/java/com/thinkgem/jeesite/modules/pay/service/BenefitSevice.java

 package com.thinkgem.jeesite.modules.pay.service;
 
 import com.thinkgem.jeesite.common.utils.DateUtils;
+import com.thinkgem.jeesite.modules.pay.bean.OrderRequest;
+import com.thinkgem.jeesite.modules.pay.dao.OrderApiDao;
 import com.thinkgem.jeesite.modules.pay.dao.PayApiDao;
 import com.thinkgem.jeesite.modules.pay.entity.BalanceEntity;
 import com.thinkgem.jeesite.modules.pay.entity.BenefitEntity;
@@ -12,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.DecimalFormat;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author niehh
@@ -24,6 +27,14 @@ public class BenefitSevice {
     @Autowired
     private PayApiDao payDao;
 
+    @Autowired
+    private OrderApiDao orderApiDao;
+
+    /**
+     * 余额
+     * @param entity
+     * @return
+     */
     public BalanceEntity getBalance(BenefitEntity entity){
 
         BalanceEntity balanceEntity = new BalanceEntity();
@@ -102,4 +113,23 @@ public class BenefitSevice {
 
         return balanceEntity;
     }
+
+
+    /**
+     * 分润
+     * @param request
+     * @return
+     */
+    public List<BenefitEntity> getBenefitList(OrderRequest request){
+        if(request.getStartDate()!= null){
+            request.setStartTime(DateUtils.formatDate(request.getStartDate(),"yyyy-MM-dd") + " 00:00:00");
+        }
+        if(request.getEndDate() != null){
+            request.setEndTime(DateUtils.formatDate(request.getEndDate(),"yyyy-MM-dd") + " 23:59:59");
+        }
+
+        return orderApiDao.getBenefitList(request);
+
+    }
+
 }

src/main/java/com/thinkgem/jeesite/modules/pay/service/OrderService.java

@@ -3,6 +3,7 @@ package com.thinkgem.jeesite.modules.pay.service;
 import com.thinkgem.jeesite.common.utils.DateUtils;
 import com.thinkgem.jeesite.modules.pay.bean.OrderRequest;
 import com.thinkgem.jeesite.modules.pay.dao.OrderApiDao;
+import com.thinkgem.jeesite.modules.pay.entity.BenefitEntity;
 import com.thinkgem.jeesite.modules.pay.entity.OrderEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,4 +35,6 @@ public class OrderService {
 
     }
 
+
+
 }

src/main/java/com/thinkgem/jeesite/modules/pay/service/PayApiService.java

@@ -68,6 +68,7 @@ public class PayApiService {
         for (String key : userBenefits.keySet()) {
             String benefitCode = IdGen.randomBase62(64);
             BenefitEntity benefitEntity = new BenefitEntity(benefitCode, request.getSubMerchantCode(), code, request.getPayChannel(), "0", "A", userBenefits.get(key), "");
+            benefitEntity.setAmount(String.valueOf(Double.valueOf(benefitEntity.getAmount())/100));
             payDao.saveBenefitInfo(benefitEntity);
         }
         // 4. JuHeZhong支付

src/main/java/com/thinkgem/jeesite/modules/user/service/UserApiService.java

@@ -363,4 +363,7 @@ public class UserApiService {
         }
         userDao.updateUser(request);
     }
+
+
+
 }

src/main/resources/mappings/modules/pay/OrderApiDao.xml

@@ -32,4 +32,36 @@
         </if>
 
     </select>
+    <select id="getBenefitList" resultType="com.thinkgem.jeesite.modules.pay.entity.BenefitEntity">
+        SELECT
+        o.pay_code AS "orderEntity.payCode",
+        o.pay_no AS "orderEntity.payNo",
+        o.pay_status AS "orderEntity.payStatus",
+        o.pay_type AS "orderEntity.payType",
+        o.pay_channel AS "orderEntity.payChannel",
+        o.amount AS "orderEntity.amount",
+        o.create_date AS "orderEntity.createDate",
+        o.`subject` AS "orderEntity.subject",
+        sd.label AS "orderEntity.payChannelName",
+        yb.amount AS "amount"
+        FROM
+        youka_benefit yb
+        LEFT JOIN `youka_orders` o ON yb.order_code = o.`code`
+        LEFT JOIN sys_dict sd ON sd.`VALUE` = o.pay_channel
+        WHERE o.del_flag = 0
+        AND o.user_code = #{subMerchantCode}
+        <if test="payChannel != null and payChannel != ''">
+            AND o.pay_channel = #{payChannel}
+        </if>
+        <if test="payStatus != null and payStatus != ''">
+            AND o.pay_status = #{payStatus}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND o.create_date &gt;= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND o.create_date &lt;= #{endTime}
+        </if>
+        AND yb.del_flag = 0
+    </select>
 </mapper>
\ No newline at end of file