update

jsowell-admin/src/main/java/com/jsowell/service/MemberService.java

@@ -689,7 +689,7 @@ public class MemberService {
 
 				// 将支付金额修改数据库
 				OrderBasicInfo basicInfo = new OrderBasicInfo();
-				basicInfo.setId(Long.parseLong(orderVO.getId()));
+				basicInfo.setId(Integer.parseInt(orderVO.getId()));
 				basicInfo.setPayAmount(payAmount);
 
 				orderBasicInfoService.updateOrderBasicInfo(basicInfo);

jsowell-admin/src/main/java/com/jsowell/service/TempService.java

@@ -203,7 +203,7 @@ public class TempService {
         }
 
         OrderBasicInfo build = OrderBasicInfo.builder()
-                .id(Long.parseLong(orderListVO.getId()))
+                .id(Integer.parseInt(orderListVO.getId()))
                 .orderCode(orderListVO.getOrderCode())
                 .orderAmount(orderAmount)
                 .virtualAmount(virtualAmount)

jsowell-admin/src/test/java/SpringBootTestController.java

@@ -2833,7 +2833,7 @@ public class SpringBootTestController {
             if (StringUtils.equals(orderListVO.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) {
                 // 修改数据库订单状态
                 OrderBasicInfo info = OrderBasicInfo.builder()
-                        .id(Long.parseLong(orderListVO.getId()))
+                        .id(Integer.parseInt(orderListVO.getId()))
                         .orderStatus(OrderStatusEnum.ABNORMAL.getValue())
                         .build();
                 orderBasicInfoService.updateOrderBasicInfo(info);

jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java

@@ -1,12 +1,9 @@
 package com.jsowell.pile.domain;
 
+import lombok.*;
+
 import java.math.BigDecimal;
 import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 /**
  * 订单主表
@@ -83,6 +80,8 @@ public class OrderBasicInfo {
      */
     private String startMode;
 
+    private String thirdPartyType;
+
     /**
      * 支付方式(1-余额支付；3-白名单支付；4-微信支付；5-支付宝支付)
      */

jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java

@@ -83,4 +83,7 @@ public class QueryOrderDTO extends BaseEntity {
 	 * 结算结束时间
 	 */
 	private String endSettleTime;
+
+	// 会员组编号
+	private String groupCode;
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -220,10 +220,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
             return orderListVOS;
         }
 
-        // 批量查手续费
-        // List<String> orderCodeList = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList());
-        // Map<String, ClearingBillDetail> billDetailMap = clearingBillDetailService.selectByOrderCodeList(orderCodeList);
-
         for (OrderListVO orderListVO : orderListVOS) {
             // 如果是微信支付，通过订单号查询微信支付单号
             // logger.info("如果是微信支付，通过订单号查询微信支付单号 orderListVO:{}", JSON.toJSONString(orderListVO));
@@ -252,11 +248,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
                 orderListVO.setChargingTime(DateUtils.getDatePoor(DateUtils.parseDate(chargeEndTime), DateUtils.parseDate(chargeStartTime)));
             }
 
-            // 交易手续费
-            // ClearingBillDetail clearingBillDetail = billDetailMap.get(orderListVO.getOrderCode());
-            // if (Objects.nonNull(clearingBillDetail)) {
-            //     orderListVO.setFeeAmount(clearingBillDetail.getFeeAmt() + "");
-            // }
         }
 
         batchQueryFeeAmt(orderListVOS);
@@ -2338,7 +2329,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
             if (StringUtils.equals(orderListVO.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) {
                 // 修改数据库订单状态
                 OrderBasicInfo info = OrderBasicInfo.builder()
-                        .id(Long.parseLong(orderListVO.getId()))
+                        .id(Integer.parseInt(orderListVO.getId()))
                         .orderStatus(OrderStatusEnum.ABNORMAL.getValue())
                         .build();
                 updateOrderBasicInfo(info);

jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java

@@ -779,6 +779,7 @@ public abstract class AbstractProgramLogic implements InitializingBean {
                 discountServiceAmount = totalServiceAmount.subtract(afterServiceAmountDiscount);
                 discountElectricityAmount = totalElectricityAmount.subtract(afterElectricityAmountDiscount);
             }
+            orderBasicInfo.setGroupCode(memberDiscountVO.getGroupCode());
         }
         // 订单折扣金额
         BigDecimal discountAmount = discountServiceAmount.add(discountElectricityAmount);

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -1621,6 +1621,9 @@
         <if test="merchantId != null and merchantId != ''">
             and t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
         </if>
+      <if test="groupCode != null and groupCode != ''">
+        and t1.group_code = #{groupCode,jdbcType=VARCHAR}
+      </if>
         <!-- 数据范围过滤 -->
         <!--        &amp;lt;if test="merchantDeptIds != null and merchantDeptIds.size() != 0"&amp;gt;-->
         <!--            and t3.dept_id in-->
@@ -2021,6 +2024,9 @@
             <if test="virtualAmount != null">
                 virtual_amount = #{virtualAmount},
             </if>
+          <if test="groupCode != null">
+            group_code = #{groupCode},
+          </if>
           <if test="discountAmount != null">
             discount_amount = #{discountAmount},
           </if>