fix

netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonSkuDetailView.java

@@ -39,7 +39,7 @@ public class GoodsDonSkuDetailView {
 	@DbField("sku.price")
 	private BigDecimal price;
 
-	@DbField("sku.price")
+	@DbField("sku.specific_price")
 	private BigDecimal specificPrice;
 
 	 /**

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -630,6 +630,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		BigDecimal galaxycoin = unifiedOrderPayReq.getGalaxycoin();
 		Boolean isDistribute = false;
 		Boolean isFixedDistribute  = false;
+		String callback = unifiedOrderPayReq.getCallback();
+		String callbackType = unifiedOrderPayReq.getCallbackType();
+		Boolean isNoLogin = unifiedOrderPayReq.getIsNoLogin();
 		if (galaxycoin != null && galaxycoin.compareTo(BigDecimal.valueOf(100)) < 0) {
 			throw BusinessRuntimeException.getInstance("银河币大于100才可使用");
 		}
@@ -672,7 +675,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				//记录优惠券使用状态
 				couponUser = couponStatusRecord(payRequest.getCouponExCode(), payRequest.getCouponId(), payRequest.getUserId(), couponPopularizeDto);
 			}
-			Boolean isNoLogin = payRequest.getIsNoLogin();
+			if (isNoLogin == null) {
+				isNoLogin = payRequest.getIsNoLogin();
+			}
 			Long relationId = 0L;
 			Boolean isNeedTicket = checkIsNeedGroupsRelation(goodsDon);
 			if (userId != null) {
@@ -790,6 +795,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			orderDon.setStatus(OrderDon.Status.noPayment);
 			orderDon.setUserId(user.getId());
 			orderDon.setType(OrderDon.Type.getType(payRequest.getType()));
+			if (unifiedOrderPayReq.getIsWebPay() != null) {
+				payRequest.setIsWebPay(unifiedOrderPayReq.getIsWebPay());
+			}
 			orderDon.setIsWebPay(payRequest.getIsWebPay());
 			orderDon.setSource(payRequest.getSource());
 			orderDon.setCouponExCode(payRequest.getCouponExCode());
@@ -919,6 +927,13 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			if (orderDon.getIsDp() && payRequest.getAddressId() != null) {
 				redisService.set(RedisService.key.PLUS_GOODS_ADDRESS_KEY.getName() + orderDon.getId(), payRequest.getAddressId(), RedisService.key.PLUS_GOODS_ADDRESS_KEY.getTimeout());
 			}
+			if (StrUtil.isNotBlank(callback)) {
+				payRequest.setCallback(callback);
+			}
+
+			if (StrUtil.isNotBlank(callbackType)) {
+				payRequest.setCallbackType(callbackType);
+			}
 
 			//数据回传
 			if (StringUtils.isNotBlank(payRequest.getCallback())) {
@@ -988,6 +1003,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderMasterDon.setGalaxycoin(pay_galaxycoin);
 		orderMasterDon.setIsDistribute(isDistribute);
 		orderMasterDon.setIsFixedDistribute(isFixedDistribute);
+		orderMasterDon.setIsWebPay(unifiedOrderPayReq.getIsWebPay());
 		//默认支付宝支付
 		orderMasterDon.setType(OrderMasterDon.Type.ALI_PAY);
 		orderMasterDonService.save(orderMasterDon);