修改bug

mall-dao/src/main/java/com/buy507/mall/mapper/OmsOrderItemMapper.java

@@ -29,4 +29,6 @@ public interface OmsOrderItemMapper {
     int updateByPrimaryKey(OmsOrderItem record);
 
     OmsOrderItem selectByOrderId(Long orderId);
+
+    OmsOrderItem getByOrderSn(String orderSn);
 }

mall-dao/src/main/java/com/buy507/mall/mapper/OmsOrderMapper.java

@@ -33,4 +33,5 @@ public interface OmsOrderMapper {
     int updateByPrimaryKey(OmsOrder record);
 
 
-    PmsProduct selectAll(@Param("orderSn") String orderSn);}
+    PmsProduct selectAll(@Param("orderSn") String orderSn);
+}

mall-dao/src/main/java/com/buy507/mall/model/UmsMemberAccountTransactionExample.java

@@ -361,6 +361,11 @@ public class UmsMemberAccountTransactionExample {
             return (Criteria) this;
         }
 
+        public Criteria andFlowTypeEqualTo(Integer value) {
+            addCriterion("flow_type =", value, "flowType");
+            return (Criteria) this;
+        }
+
         public Criteria andTransactionStateNotEqualTo(Integer value) {
             addCriterion("transaction_state <>", value, "transactionState");
             return (Criteria) this;

mall-dao/src/main/resources/com/buy507/mall/mapper/OmsOrderItemMapper.xml

@@ -513,4 +513,34 @@
     select * from mall.oms_order_item where order_id = #{orderId}
 
   </select>
+    <select id="getByOrderSn" resultType="com.buy507.mall.model.OmsOrderItem">
+        select id,
+               order_id,
+               order_sn,
+               product_id,
+               product_pic,
+               product_name,
+               product_brand,
+               product_sn,
+               product_price,
+               product_quantity,
+               product_sku_id,
+               product_sku_code,
+               product_category_id,
+               promotion_name,
+               promotion_amount,
+               coupon_amount,
+               integration_amount,
+               real_amount,
+               gift_integration,
+               gift_growth,
+               product_attr,
+               sp1,
+               sp2,
+               sp3,
+               intergrationPrice,
+               intergrationExchange
+        from oms_order_item
+        where order_sn = #{orderSn}
+    </select>
 </mapper>

mall-dao/src/main/resources/com/buy507/mall/mapper/OmsOrderMapper.xml

@@ -926,4 +926,5 @@
                JOIN oms_order o ON oi.order_sn = o.order_sn
       WHERE o.order_sn = #{orderSn}
   </select>
+  <select id="getPnameByOrderSn" resultType="java.lang.String"></select>
 </mapper>

mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -1573,10 +1573,11 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         accountTransaction.setFlowType(1);
         accountTransaction.setTransferPaymentTime(orderResult.getPaymentTime());
         accountTransaction.setRevenueAmount(payAmount.negate());
-        PmsProduct pmsProduct = orderMapper.selectAll(orderResult.getOrderSn());
+        OmsOrderItem orderItem = orderItemMapper.getByOrderSn(orderResult.getOrderSn());
-        accountTransaction.setRemarks( "商品名称" + pmsProduct.getName());
+        accountTransaction.setRemarks("商品名称" + orderItem.getProductName());
         umsMemberAccountTransactionMapper.insert(accountTransaction);
 
+        PmsProduct pmsProduct = orderMapper.selectAll(orderResult.getOrderSn());
         //如果是积分专区的商品则进行积分专区相对应的逻辑
         if (pmsProduct.getPointsAreaStatus() == 1) {
             //奖励积分是购买的价格的100%
@@ -1615,8 +1616,10 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         order.setStatus(2);
         order.setPaymentTime(new Date());
         orderMapper.updateByPrimaryKey(order);
+        if (pmsProduct.getPointsAreaStatus() == 1) {
             //积分分润逻辑
             memberPointsSplitProfitService.pointsSplit(order);
+        }
 
         // 处理库存、分销等后续操作
         executorService.execute(() -> {
@@ -1646,8 +1649,6 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
     }
 
 
-
-
     /**
      * 微信预支付
      *

mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java

@@ -529,6 +529,7 @@ public class UmsMemberServiceImpl implements UmsMemberService {
         BigDecimal totalIncome = BigDecimal.ZERO;
         accountTransactionExample.createCriteria()
                 .andTransactionStateEqualTo(UmsMemberAccountTransaction.TRANSACTION_STATE_YES)
+                .andFlowTypeEqualTo(1)
                 .andMemberIdEqualTo(member.getId());
 
         List<UmsMemberAccountTransaction> totalList = umsMemberAccountTransactionMapper.selectByExample(accountTransactionExample);
@@ -546,6 +547,7 @@ public class UmsMemberServiceImpl implements UmsMemberService {
         accountTransactionExample.createCriteria()
                 .andTransferPaymentTimeBetween(DateUtil.beginOfDay(nowTime) ,nowTime)
                 .andTransactionStateEqualTo(UmsMemberAccountTransaction.TRANSACTION_STATE_YES)
+                .andFlowTypeEqualTo(1)
                 .andMemberIdEqualTo(member.getId());
         List<UmsMemberAccountTransaction> todayIncomeList = umsMemberAccountTransactionMapper.selectByExample(accountTransactionExample);
         if(todayIncomeList!= null && !todayIncomeList.isEmpty()){

mall-portal/src/main/java/com/buy507/mall/portal/service/impl/VipCenterServiceImpl.java

@@ -83,6 +83,7 @@ public class VipCenterServiceImpl implements VipCenterService {
             //返回订单id
             Map<String, Object> result = new HashMap<>();
             result.put("orderId", order.getId());
+            result.put("orderType", order.getOrderType());
             return CommonResult.success(result, "下单成功");
         }
     }