订单中放进，乐团跟声部

src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -118,6 +118,8 @@ public class YqPayController extends BaseController {
 
         ApplyInfo applyInfo = applyInfoService.get(order.getUserId());
 
+        order.setPoName(school.getName());
+        order.setVoicyPart(courseGroupInfo.getSubName());
         order.setGroupId(courseGroupInfo.getId());
         order.setAmount(amount);
         order.setRemark(instrumentName);
@@ -208,7 +210,7 @@ public class YqPayController extends BaseController {
         }
         if (pickCourses.size() == 0) {
             return failed("请选择续费课程");
-        };
+        }
 
         String orderNo = GenerateNum.getInstance().GenerateOrderNo(); //自己系统订单号
         //获取分佣账户
@@ -359,23 +361,26 @@ public class YqPayController extends BaseController {
         Order order = null;
         NotifyMsg notifyMsg = null;
         if (rs) {
-            notifyMsg = JSON.parseObject(msg.getResponseParameters(), NotifyMsg.class);
+            Map<String, String> notifyMap = JSON.parseObject(msg.getResponseParameters(), Map.class);
             String merMerOrderNo = notifyMsg.getMerMerOrderNo(); //自己系统订单号
             order = orderService.getOrderByOrderNo(merMerOrderNo);
         }
         //支付中订单存在，更新状态
         if (order != null && msg.getResponseType().equals("1")) {
             //更新订单状态
+            HashMap<String, Object> upMap = new HashMap<>();
+            upMap.put("oldStatus", order.getStatus());
             int status = msg.getCode().equals("88") ? 2 : 0;
-            order.setStatus(status);
+            upMap.put("status", status);
+            upMap.put("bank", notifyMsg.getChannelType());//支付通道
             if (order.getOrderNo().isEmpty()) {
-                order.setPayId(notifyMsg.getOrderNo()); //更新易乾付订单号
+                upMap.put("payId", notifyMsg.getOrderNo());//更新易乾付订单号
             }
             if (status == 2) {
-                order.setPay(notifyMsg.getPayAmount());
-                order.setPayTime(new Date());
+                upMap.put("pay", notifyMsg.getPayAmount());
+                upMap.put("payTime", new Date());//付款时间
             }
-            //orderService.update(order);
+           // orderService.updateByIdAndStatus(upMap);
             //ApplyInfo applyInfo = applyInfoService.get(order.getUserId());
             //applyInfoService.userRegister(applyInfo.getPatriarchPhone(), order.getId()); //推送mec
 
@@ -431,18 +436,20 @@ public class YqPayController extends BaseController {
         if (order == null) {
             return;
         }
-        order.setStatus(status);
-        order.setBank(rpMap.get("channelType"));
+        HashMap<String, Object> upMap = new HashMap<>();
+        upMap.put("oldStatus", 1);
+        upMap.put("status", status);
+        upMap.put("bank", rpMap.get("channelType"));
 
         if (order.getPayId() == null) {
-            order.setPayId(rpMap.get("orderNo")); //更新易乾付订单号
+            upMap.put("payId", rpMap.get("orderNo"));
         }
         if (status == 2) {
-            order.setPay(order.getAmount());
-            order.setPayTime(new Date());
+            upMap.put("pay", rpMap.get("totalMoney"));
+            upMap.put("payTime", new Date());
             //推送mec
-            ApplyInfo applyInfo = applyInfoService.get(order.getUserId());
             if (order.getTuiFee() != null) { //乐团报名
+                ApplyInfo applyInfo = applyInfoService.get(order.getUserId());
                 applyInfo.setStatus(1);
                 applyInfoService.update(applyInfo);
                 applyInfoService.userRegister(applyInfo.getPatriarchPhone(), order.getId()); //推送mec
@@ -474,7 +481,7 @@ public class YqPayController extends BaseController {
                 CourseGroupInfoService.upByIdAndVersion(courseGroupInfo);
             }
         }
-        orderService.update(order);
+        orderService.updateByIdAndStatus(upMap);
     }
 
 }

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

@@ -5,6 +5,7 @@ import com.ym.mec.collectfee.entity.Order;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 import java.util.List;
+import java.util.Map;
 
 @Component
 public interface OrderDao extends BaseDAO<Integer, Order> {
@@ -22,4 +23,6 @@ public interface OrderDao extends BaseDAO<Integer, Order> {
     int getPayOrderNums();
 
     List<Order> findPayingOrders();
+
+    int updateByIdAndStatus(Map upMap);
 }

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

@@ -70,5 +70,21 @@ public interface OrderService extends BaseService<Integer, Order> {
      */
     List<Order> findPayingOrders();
 
+    /**
+     * 获取支付的参数
+     * @param account
+     * @param order
+     * @param school
+     * @return
+     * @throws Exception
+     */
     Map getPayMap(Account account, Order order, School school) throws Exception;
+
+    /**
+     * 根据id和status状态更新订单
+     * @param upMap
+     * @return
+     */
+    int updateByIdAndStatus(Map upMap);
+
 }

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

@@ -140,7 +140,7 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
     public Map getPayMap(Account routingAccount, Order order, School school) throws Exception {
 
         String notifyUrl = this.notifyUrl; //异步通知地址
-        String returnUrl = this.returnHost + "/#/payment?userId="+order.getUserId();//支付后返回页面
+        String returnUrl = this.returnHost + "/#/payment?userId=" + order.getUserId();//支付后返回页面
 
         if (school != null) {
             returnUrl = this.returnHost + "/#/login?schoolId=" + school.getSchoolId() + "&classId=" + order.getClassId() + "&cityId=" + school.getCityId();//支付后返回页面
@@ -179,5 +179,10 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
         return rqMap;
     }
 
+    @Override
+    public int updateByIdAndStatus(Map upMap) {
+        return orderDao.updateByIdAndStatus(upMap);
+    }
+
 
 }

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

@@ -70,6 +70,7 @@ public class RenewalsServiceImpl extends BaseServiceImpl<Integer, Renewals> impl
             order.setUserName(course.getSubNames());
             Integer type = course.getClassType() == 2 ? 2 : 3;
             order.setType(type);
+            order.setVoicyPart(course.getSubNames());
 
             Renewals rws = new Renewals();
             rws.setUserId(course.getStudentId());

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

@@ -164,4 +164,27 @@
 	<select id="findPayingOrders" resultMap="Order">
 		SELECT * FROM `order` WHERE status = 1
 	</select>
+
+	<!-- 根据 -->
+	<update id="updateByIdAndStatus" parameterType="map">
+		UPDATE `order`
+		<set>
+			<if test="pay != null">
+				pay = #{pay},
+			</if>
+			<if test="payTime != null">
+				pay_time = #{payTime},
+			</if>
+			<if test="bank != null">
+				bank = #{bank},
+			</if>
+			<if test="payId != null">
+				pay_id = #{payId},
+			</if>
+			<if test="status != null">
+				status = #{status}
+			</if>
+		</set>
+		WHERE id = #{id} AND `status` =  #{oldStatus}
+	</update>
 </mapper>