订单列表显示分部

src/main/java/com/ym/mec/collectfee/dao/BranchDao.java

@@ -12,7 +12,10 @@ public interface BranchDao extends BaseDAO<Integer, Branch> {
 
     /**
      * 批量插入分部列表
+     *
      * @param branches
      */
     void batchInsert(@Param("branches") List<Branch> branches);
+
+    List<Branch> findBranchByList(@Param("list") List branches);
 }

src/main/java/com/ym/mec/collectfee/entity/Order.java

@@ -132,6 +132,8 @@ public class Order {
 //	@ApiModelProperty(name = "goodsFee", value = "杂费名称",hidden = true)
 	private String sdName;
 
+	private String branchName;
+
 	//手续费
 	private BigDecimal commission;
 
@@ -397,4 +399,12 @@ public class Order {
 	public void setCommission(BigDecimal commission) {
 		this.commission = commission;
 	}
+
+	public String getBranchName() {
+		return branchName;
+	}
+
+	public void setBranchName(String branchName) {
+		this.branchName = branchName;
+	}
 }

src/main/java/com/ym/mec/collectfee/service/BranchService.java

@@ -2,7 +2,17 @@ package com.ym.mec.collectfee.service;
 
 import com.ym.mec.collectfee.common.service.BaseService;
 import com.ym.mec.collectfee.entity.Branch;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface BranchService extends BaseService<Integer, Branch> {
 
+    /**
+     * 批量获取分部
+     * @param branches
+     * @return
+     */
+    List<Branch> findBranchByList(List branches);
+
 }

src/main/java/com/ym/mec/collectfee/service/impl/BranchServiceImpl.java

@@ -8,6 +8,8 @@ import com.ym.mec.collectfee.service.BranchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class BranchServiceImpl extends BaseServiceImpl<Integer, Branch> implements BranchService {
 	
@@ -18,5 +20,9 @@ public class BranchServiceImpl extends BaseServiceImpl<Integer, Branch> implemen
 	public BaseDAO<Integer, Branch> getDAO() {
 		return branchDao;
 	}
-	
+
+    @Override
+    public List<Branch> findBranchByList(List branches) {
+        return branchDao.findBranchByList(branches);
+    }
 }

src/main/java/com/ym/mec/collectfee/service/impl/OrderServiceImpl.java

@@ -6,12 +6,10 @@ import com.ym.mec.collectfee.common.dao.BaseDAO;
 import com.ym.mec.collectfee.common.page.PageInfo;
 import com.ym.mec.collectfee.common.service.impl.BaseServiceImpl;
 import com.ym.mec.collectfee.dao.AccountDao;
+import com.ym.mec.collectfee.dao.BranchDao;
 import com.ym.mec.collectfee.dao.OrderDao;
 import com.ym.mec.collectfee.entity.*;
-import com.ym.mec.collectfee.service.CourseGroupInfoService;
-import com.ym.mec.collectfee.service.OrderService;
-import com.ym.mec.collectfee.service.SchoolService;
-import com.ym.mec.collectfee.service.YqPayService;
+import com.ym.mec.collectfee.service.*;
 import com.ym.mec.collectfee.utils.HttpUtil;
 import com.ym.mec.collectfee.utils.MapUtil;
 import com.ym.mec.collectfee.utils.XStreamUtil;
@@ -42,6 +40,8 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
     private CourseGroupInfoService courseGroupInfoService;
     @Autowired
     private AccountDao accountDao;
+    @Autowired
+    private ApplyInfoService applyInfoService;
 
     //公共密钥
     @Value("${common.properties.mec-publicKey}")
@@ -246,9 +246,16 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
             pageInfo.setTotalPage(totalPage);
             params.put("offset", pageInfo.getOffset());
             dataList = orderDao.queryOrderPage(params);
+            List<Branch> branchList = applyInfoService.getBranches();
             for (Order order : dataList) {
                 BigDecimal commission = order.getAmount().multiply(new BigDecimal(0.28)).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);//手续费
                 order.setCommission(commission);
+                for (Branch branch : branchList) {
+                    if (branch.getBranchId().equals(order.getBranchId())) {
+                        order.setBranchName(branch.getBranchName());
+                        break;
+                    }
+                }
             }
         }
         if (count == 0) {

src/main/resources/config/mybatis/BranchMapper.xml

@@ -71,4 +71,11 @@
 	<select id="findCount" resultType="int">
 		SELECT COUNT(*) FROM branch
 	</select>
+
+	<select id="findBranchByList" resultMap="Branch">
+		SELECT * FROM branch WHERE branch_id_ IN
+		<foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+			#{item.branchId}
+		</foreach>
+	</select>
 </mapper>