Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPaymentOrder.java

@@ -34,6 +34,9 @@ public class StudentPaymentOrder {
 	@ApiModelProperty(value = "分部编号",required = true)
 	private Integer organId;
 
+	@ApiModelProperty(value = "分配分部编号",required = true)
+	private Integer routingOrganId;
+
 	/** 订单类型(报名、续费、小课购买、其他) */
 	@ApiModelProperty(value = "订单类型",required = true)
 	private OrderTypeEnum type;
@@ -327,6 +330,14 @@ public class StudentPaymentOrder {
 		this.remitFee = remitFee;
 	}
 
+	public Integer getRoutingOrganId() {
+		return routingOrganId;
+	}
+
+	public void setRoutingOrganId(Integer routingOrganId) {
+		this.routingOrganId = routingOrganId;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentPaymentOrderQueryInfo.java

@@ -32,6 +32,9 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "订单类型",required = false)
     private String orderType;
 
+    @ApiModelProperty(value = "分配分部",required = false)
+    private String routingOrganId;
+
     private boolean isExport = false;
 
     public boolean getIsExport() {
@@ -113,4 +116,12 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     public void setOrderType(String orderType) {
         this.orderType = orderType;
     }
+
+    public String getRoutingOrganId() {
+        return routingOrganId;
+    }
+
+    public void setRoutingOrganId(String routingOrganId) {
+        this.routingOrganId = routingOrganId;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EduPracticeGroupServiceImpl.java

@@ -435,6 +435,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
                 studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
                 studentPaymentOrder.setUpdateTime(now);
                 studentPaymentOrder.setOrganId(practiceGroupBuyParams.getOrganId());
+                studentPaymentOrder.setRoutingOrganId(42);
 
                 sysUserCashAccountService.updateBalance(practiceGroupBuyParams.getStudentId(), studentPaymentOrder.getExpectAmount().negate(),PlatformCashAccountDetailTypeEnum.PAY_FEE,operatorInfo+"，教务代买");
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -324,8 +324,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
 
         studentPaymentOrder.setPaymentChannel("BALANCE");
-        //studentPaymentOrder.setOrganId(chargeInfo.getOrganId());
-        studentPaymentOrder.setOrganId(42);
+        studentPaymentOrder.setOrganId(chargeInfo.getOrganId());
+        studentPaymentOrder.setRoutingOrganId(42);
         studentPaymentOrder.setUpdateTime(date);
         studentPaymentOrderService.update(studentPaymentOrder);
         studentPaymentOrder.setVersion(studentPaymentOrder.getVersion() + 1);
@@ -362,8 +362,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         );
 
         Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
-        //studentPaymentOrder.setOrganId(chargeInfo.getOrganId());
-        studentPaymentOrder.setOrganId(42);
+        studentPaymentOrder.setOrganId(chargeInfo.getOrganId());
+        studentPaymentOrder.setRoutingOrganId(42);
         studentPaymentOrder.setComAmount(routingFee.get("COM"));
         studentPaymentOrder.setPerAmount(routingFee.get("PER"));
         studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
@@ -541,8 +541,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         studentPaymentOrder.setPaymentChannel("BALANCE");
         studentPaymentOrder.setRemitFee(remitFee);
-        //studentPaymentOrder.setOrganId(musicGroup.getOrganId());
-        studentPaymentOrder.setOrganId(42);
+        studentPaymentOrder.setOrganId(musicGroup.getOrganId());
+        studentPaymentOrder.setRoutingOrganId(42);
         studentPaymentOrder.setUpdateTime(date);
         studentPaymentOrderService.update(studentPaymentOrder);
         studentPaymentOrder.setVersion(studentPaymentOrder.getVersion() + 1);
@@ -596,8 +596,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         );
 
         Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
-        //studentPaymentOrder.setOrganId(musicGroup.getOrganId());
-        studentPaymentOrder.setOrganId(42);
+        studentPaymentOrder.setOrganId(musicGroup.getOrganId());
+        studentPaymentOrder.setRoutingOrganId(42);
         studentPaymentOrder.setComAmount(routingFee.get("COM"));
         studentPaymentOrder.setPerAmount(routingFee.get("PER"));
         studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
@@ -780,8 +780,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         studentPaymentOrder.setPaymentChannel("BALANCE");
         studentPaymentOrder.setRemitFee(remitFee);
-        //studentPaymentOrder.setOrganId(musicGroup.getOrganId());
-        studentPaymentOrder.setOrganId(42);
+        studentPaymentOrder.setOrganId(musicGroup.getOrganId());
+        studentPaymentOrder.setRoutingOrganId(42);
         studentPaymentOrder.setUpdateTime(date);
         studentPaymentOrderService.update(studentPaymentOrder);
         studentPaymentOrder.setVersion(studentPaymentOrder.getVersion() + 1);
@@ -834,8 +834,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         );
 
         Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
-        //studentPaymentOrder.setOrganId(musicGroup.getOrganId());
-        studentPaymentOrder.setOrganId(42);
+        studentPaymentOrder.setOrganId(musicGroup.getOrganId());
+        studentPaymentOrder.setRoutingOrganId(42);
         studentPaymentOrder.setComAmount(routingFee.get("COM"));
         studentPaymentOrder.setPerAmount(routingFee.get("PER"));
         studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
@@ -1623,8 +1623,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 studentPaymentOrder.setBalancePaymentAmount(amount);
                 studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
                 studentPaymentOrder.setUpdateTime(date);
-                //studentPaymentOrder.setOrganId(musicGroup.getOrganId());
-                studentPaymentOrder.setOrganId(42);
+                studentPaymentOrder.setOrganId(musicGroup.getOrganId());
+                studentPaymentOrder.setRoutingOrganId(42);
                 studentPaymentOrderService.update(studentPaymentOrder);
 
                 sysUserCashAccountService.updateBalance(userId, amount.negate(), PlatformCashAccountDetailTypeEnum.PAY_FEE, "乐团续费");
@@ -1669,8 +1669,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             );
 
             Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
-            //studentPaymentOrder.setOrganId(musicGroup.getOrganId());
-            studentPaymentOrder.setOrganId(42);
+            studentPaymentOrder.setOrganId(musicGroup.getOrganId());
+            studentPaymentOrder.setRoutingOrganId(42);
             studentPaymentOrder.setComAmount(routingFee.get("COM"));
             studentPaymentOrder.setPerAmount(routingFee.get("PER"));
             studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -2929,8 +2929,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 studentPaymentOrder.setBalancePaymentAmount(studentPaymentOrder.getExpectAmount());
                 studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
                 studentPaymentOrder.setUpdateTime(now);
-                //studentPaymentOrder.setOrganId(practiceGroupBuyParams.getOrganId());
-                studentPaymentOrder.setOrganId(42);
+                studentPaymentOrder.setOrganId(practiceGroupBuyParams.getOrganId());
+                studentPaymentOrder.setRoutingOrganId(42);
 
                 sysUserCashAccountService.updateBalance(practiceGroupBuyParams.getStudentId(), studentPaymentOrder.getExpectAmount().negate(),PlatformCashAccountDetailTypeEnum.PAY_FEE,"网管课购买");
 
@@ -2972,8 +2972,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             );
 
             Map<String,BigDecimal> routingFee = (Map<String,BigDecimal>)payMap.get("routingFee");
-            //studentPaymentOrder.setOrganId(practiceGroupBuyParams.getOrganId());
-            studentPaymentOrder.setOrganId(42);
+            studentPaymentOrder.setOrganId(practiceGroupBuyParams.getOrganId());
+            studentPaymentOrder.setRoutingOrganId(42);
             studentPaymentOrder.setComAmount(routingFee.get("COM"));
             studentPaymentOrder.setPerAmount(routingFee.get("PER"));
             studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
@@ -3284,8 +3284,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 newOrder.setBalancePaymentAmount(newOrder.getExpectAmount());
                 newOrder.setStatus(DealStatusEnum.SUCCESS);
                 newOrder.setUpdateTime(new Date());
-                //newOrder.setOrganId(practiceGroup.getOrganId());
-                newOrder.setOrganId(42);
+                newOrder.setOrganId(practiceGroup.getOrganId());
+                newOrder.setRoutingOrganId(42);
 
                 sysUserCashAccountService.updateBalance(userId, newOrder.getExpectAmount().negate(),PlatformCashAccountDetailTypeEnum.PAY_FEE,"网管课购买");
 
@@ -3328,8 +3328,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
             Map<String,BigDecimal> routingFee = (Map<String,BigDecimal>)payMap.get("routingFee");
             newOrder.setStatus(DealStatusEnum.ING);
-            //newOrder.setOrganId(practiceGroup.getOrganId());
-            newOrder.setOrganId(42);
+            newOrder.setOrganId(practiceGroup.getOrganId());
+            newOrder.setRoutingOrganId(42);
             newOrder.setComAmount(routingFee.get("COM"));
             newOrder.setPerAmount(routingFee.get("PER"));
             newOrder.setMerNos((String) payMap.get("routingMerNos"));

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -612,8 +612,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             studentPaymentOrder.setStatus(DealStatusEnum.WAIT_PAY);
             studentPaymentOrder.setMusicGroupId(musicGroupId);
             studentPaymentOrder.setClassGroupId(studentAddDto.getSignClassId());
-            //studentPaymentOrder.setOrganId(musicGroup.getOrganId());
-            studentPaymentOrder.setOrganId(42);
+            studentPaymentOrder.setOrganId(musicGroup.getOrganId());
+            studentPaymentOrder.setRoutingOrganId(42);
 
             //生成订单明细
             List<StudentPaymentOrderDetail> studentPaymentOrderDetails = studentAddDto.getStudentPaymentOrderDetails();

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -1186,8 +1186,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				studentPaymentOrder.setBalancePaymentAmount(amount);
 				studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
 				studentPaymentOrder.setUpdateTime(date);
-				//studentPaymentOrder.setOrganId(vipGroup.getOrganId());
-		        studentPaymentOrder.setOrganId(42);
+				studentPaymentOrder.setOrganId(vipGroup.getOrganId());
+		        studentPaymentOrder.setRoutingOrganId(42);
 
 				this.orderCallback(studentPaymentOrder);
 
@@ -1237,8 +1237,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			);
 
 			Map<String,BigDecimal> routingFee = (Map<String,BigDecimal>)payMap.get("routingFee");
-			//studentPaymentOrder.setOrganId(vipGroup.getOrganId());
-			studentPaymentOrder.setOrganId(42);
+			studentPaymentOrder.setOrganId(vipGroup.getOrganId());
+			studentPaymentOrder.setRoutingOrganId(42);
 			studentPaymentOrder.setComAmount(routingFee.get("COM"));
 			studentPaymentOrder.setPerAmount(routingFee.get("PER"));
 			studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -83,12 +83,12 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentPaymentOrder" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO student_payment_order
-        (id_, group_type_, user_id_,organ_id_, type_, expect_amount_, actual_amount_, com_amount_, per_amount_,
+        (id_, group_type_, user_id_,organ_id_,routing_organ_id_, type_, expect_amount_, actual_amount_, com_amount_, per_amount_,
          balance_payment_amount_, remit_fee_, trans_no_,
          status_, memo_, create_time_, update_time_, payment_channel_, payment_business_channel_,
          payment_account_no_, mer_nos_, order_no_, music_group_id_, class_group_id_)
         VALUES (#{id}, #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-                #{userId},#{organId}, #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                #{userId},#{organId},#{routingOrganId}, #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                 #{expectAmount}, #{actualAmount}, #{comAmount}, #{perAmount}, #{balancePaymentAmount},
                 #{remitFee}, #{transNo},
                 #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{memo}, now(), now(),
@@ -163,6 +163,9 @@
             <if test="organId != null">
                 organ_id_ = #{organId},
             </if>
+            <if test="routingOrganId != null">
+                routing_organ_id_ = #{routingOrganId},
+            </if>
             <if test="payTime != null">
                 pay_time_ = #{payTime},
             </if>
@@ -228,6 +231,9 @@
             <if test='orderType != null and orderType.toString()=="2".toString()'>
                 AND spo.per_amount_ > 0
             </if>
+            <if test="routingOrganId != null">
+                AND FIND_IN_SET(spo.routing_organ_id_,#{routingOrganId})
+            </if>
         </where>
     </sql>
 

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -423,7 +423,9 @@ public class ExportController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
-            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            if(StringUtils.isEmpty(queryInfo.getOrganId()) && queryInfo.getOrderType().equals("3")){
+                queryInfo.setRoutingOrganId(employee.getOrganIdList());
+            }else if (StringUtils.isEmpty(queryInfo.getOrganId())) {
                 queryInfo.setOrganId(employee.getOrganIdList());
             }
         }

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentOrderController.java

@@ -194,5 +194,31 @@ public class StudentPaymentOrderController extends BaseController {
         return succeed(studentPaymentOrderDetailService.verifyMusicalList(musicGroupId));
     }
 
+    @ApiOperation(value = "财务订单列表")
+    @GetMapping("/finance")
+    @PreAuthorize("@pcs.hasPermissions('order/finance')")
+    public Object financeOrder(StudentPaymentOrderQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (!sysUser.getIsSuperAdmin()) {
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+                queryInfo.setRoutingOrganId(employee.getOrganIdList());
+            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+                return failed("用户所在分部异常");
+            } else {
+                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+                    return failed("非法请求");
+                }
+            }
+        }
+
+        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);
+        return succeed(studentPaymentOrderPageInfo);
+    }
+
 
 }