Commit 631d3ced authored by liuyang's avatar liuyang

update

parent adb18f33
...@@ -319,7 +319,7 @@ public class ProductOrderService extends ServiceImpl<ProductOrderMapper, Product ...@@ -319,7 +319,7 @@ public class ProductOrderService extends ServiceImpl<ProductOrderMapper, Product
//下单来源不一致 //下单来源不一致
if (orderPO.getPayMethod() == PayMethodEnum.WeiXin && orderPO.getSource() != model.getSource()){ if (orderPO.getPayMethod() == PayMethodEnum.WeiXin && orderPO.getSource() != model.getSource()){
if (orderPO.getSource() == PaySourceEnum.MWEB){ if (orderPO.getSource() == PaySourceEnum.MWEB){
throw new BusinessException("请从浏览器中支付"); throw new BusinessException("请从手机浏览器中支付");
}else if (orderPO.getSource() == PaySourceEnum.JSAPI){ }else if (orderPO.getSource() == PaySourceEnum.JSAPI){
throw new BusinessException("请从微信浏览器中支付"); throw new BusinessException("请从微信浏览器中支付");
} }
......
...@@ -15,6 +15,6 @@ ...@@ -15,6 +15,6 @@
<if test="p.orgId != null"> <if test="p.orgId != null">
and o.org_id = #{p.orgId} and o.org_id = #{p.orgId}
</if> </if>
order by `status` DESC,create_time DESC order by create_time DESC
</select> </select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment