添加订单商品信息

rs-universal/rs-universal-api/src/main/java/com/upyuns/platform/rs/universal/feign/ThirdFeign.java

@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.upyuns.platform.rs.universal.entity.Dictionary;
 import com.upyuns.platform.rs.universal.entity.IdInformation;
 import com.upyuns.platform.rs.universal.dto.SmsTemplateDTO;
+import com.upyuns.platform.rs.universal.entity.OrderPay;
 import com.upyuns.platform.rs.universal.vo.*;
 import com.upyuns.platform.rs.universal.vo.*;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -38,6 +39,9 @@ public interface ThirdFeign {
     @RequestMapping(value = "/refund/app/pay/refund", method = RequestMethod.POST)
     public ObjectRestResponse<String> refund(@RequestBody OrderRefundVo orderRefundVo);
 
+    @PostMapping(value = "pay/app/unauth/updateStatus")
+    public ObjectRestResponse updateStatus(@RequestBody OrderPay orderPay);
+
     /**
      * 获取支持的城市
      * @return

rs-website/rs-website-api/pom.xml

@@ -19,6 +19,12 @@
             <artifactId>ace-admin-api</artifactId>
             <version>2.0-rscp-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.upyuns.platform.rs</groupId>
+            <artifactId>rs-universal-api</artifactId>
+            <version>2.0-rscp-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

rs-website/rs-website-server/pom.xml

@@ -14,12 +14,7 @@
     <artifactId>rs-website-server</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>com.upyuns.platform.rs</groupId>
-            <artifactId>rs-universal-api</artifactId>
-            <version>2.0-rscp-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
+
         <dependency>
             <groupId>com.upyuns.platform.rs</groupId>
             <artifactId>rs-website-api</artifactId>

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java

@@ -16,6 +16,7 @@ import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO;
 import com.upyuns.platform.rs.datacenter.pojo.ImagePageFeginDTO;
 import com.upyuns.platform.rs.universal.constant.DictionaryKey;
 import com.upyuns.platform.rs.universal.entity.Dictionary;
+import com.upyuns.platform.rs.universal.entity.OrderPay;
 import com.upyuns.platform.rs.universal.feign.ThirdFeign;
 import com.upyuns.platform.rs.universal.vo.OrderPayVo;
 import com.upyuns.platform.rs.website.dto.*;
@@ -997,14 +998,32 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		}
 		if (old.getPayCode().equals(orderInfo.getPayCode())) {
 			old.setPayImg(orderInfo.getPayImg());
-			old.setPayStatus(2);
 			old.setPayTime(new Date());
 			updateSelectiveByIdRe(old);
-			thirdFeign.
 			return ObjectRestResponse.succ();
 		} else {
 			return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "汇款识别码错误");
 		}
 	}
 
+	/**
+	 * 后台确认对公支付成功
+	 * @param orderInfo
+	 * @return
+	 */
+	public ObjectRestResponse updatePayStatus(OrderInfo orderInfo) {
+		if (orderInfo == null || StringUtils.isBlank(orderInfo.getOrderNo())) {
+			return ObjectRestResponse.createFailedResult(ResultCode.PARAM_ILLEGAL_CODE, ResultCode.getMsg(ResultCode.PARAM_ILLEGAL_CODE));
+		}
+		OrderInfo old = getOneByOrderNo(orderInfo.getOrderNo());
+		if (old == null) {
+			return ObjectRestResponse.createFailedResult(ResultCode.ORDER_NOT_EXIST, ResultCode.getMsg(ResultCode.ORDER_NOT_EXIST));
+		}
+		old.setStatus(OrderStatusEnum.ORDER_PAID.getType());
+		old.setPayStatus(2);
+		old.setPayTime(new Date());
+		updateSelectiveByIdRe(old);
+		return thirdFeign.updateStatus(new OrderPay(){{old.getOrderNo();}});
+	}
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/OrderInfoController.java

@@ -57,4 +57,10 @@ public class OrderInfoController extends BaseController<OrderInfoBiz,OrderInfo>
 		return baseBiz.getItemByType(type, name);
 	}
 
+
+	@PostMapping(value = "updatePayStatus")
+	public ObjectRestResponse updatePayStatus(@RequestBody OrderInfo orderInfo) {
+		return baseBiz.updatePayStatus(orderInfo);
+	}
+
 }
\ No newline at end of file